diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-08-26 01:07:42 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-26 01:07:42 +0200 |
| commit | 880b0dd94f0399cf772a8582e7b5a47f180c8618 (patch) | |
| tree | f85d11673c4ed5c6d28863f5241260483d52433f /fs/cifs/smb2misc.c | |
| parent | netdev: Use try_cmpxchg in napi_if_scheduled_mark_missed (diff) | |
| parent | Merge tag 'net-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-880b0dd94f0399cf772a8582e7b5a47f180c8618.tar.xz linux-880b0dd94f0399cf772a8582e7b5a47f180c8618.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
21234e3a84c7 ("net/mlx5e: Fix use after free in mlx5e_fs_init()")
c7eafc5ed068 ("net/mlx5e: Convert ethtool_steering member of flow_steering struct to pointer")
https://lore.kernel.org/all/20220825104410.67d4709c@canb.auug.org.au/
https://lore.kernel.org/all/20220823055533.334471-1-saeed@kernel.org/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/cifs/smb2misc.c')
| -rw-r--r-- | fs/cifs/smb2misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c index 6a6ec6efb45a..d73e5672aac4 100644 --- a/fs/cifs/smb2misc.c +++ b/fs/cifs/smb2misc.c @@ -222,7 +222,7 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *server) } } - calc_len = smb2_calc_size(buf, server); + calc_len = smb2_calc_size(buf); /* For SMB2_IOCTL, OutputOffset and OutputLength are optional, so might * be 0, and not a real miscalculation */ @@ -410,7 +410,7 @@ smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *shdr) * portion, the number of word parameters and the data portion of the message. */ unsigned int -smb2_calc_size(void *buf, struct TCP_Server_Info *srvr) +smb2_calc_size(void *buf) { struct smb2_pdu *pdu = buf; struct smb2_hdr *shdr = &pdu->hdr; |