diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2018-06-28 02:47:14 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-07-05 20:48:24 +0200 |
| commit | 81f39f951b8098b1c59b01ad10d06d7dc01c7019 (patch) | |
| tree | 220f25cf5198753014f35ee11a9722d3a7df4e7d /fs/cifs/smb2proto.h | |
| parent | cifs: Fix validation of signed data in smb2 (diff) | |
| download | linux-81f39f951b8098b1c59b01ad10d06d7dc01c7019.tar.xz linux-81f39f951b8098b1c59b01ad10d06d7dc01c7019.zip | |
cifs: fix SMB1 breakage
SMB1 mounting broke in commit 35e2cc1ba755
("cifs: Use correct packet length in SMB2_TRANSFORM header")
Fix it and also rename smb2_rqst_len to smb_rqst_len
to make it less unobvious that the function is also called from
CIFS/SMB1
Good job by Paulo reviewing and cleaning up Ronnie's original patch.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: Paulo Alcantara <palcantara@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2proto.h')
| -rw-r--r-- | fs/cifs/smb2proto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index 3ae208ac2a77..6e6a4f2ec890 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -113,8 +113,8 @@ extern int smb2_unlock_range(struct cifsFileInfo *cfile, extern int smb2_push_mandatory_locks(struct cifsFileInfo *cfile); extern void smb2_reconnect_server(struct work_struct *work); extern int smb3_crypto_aead_allocate(struct TCP_Server_Info *server); -extern unsigned long -smb2_rqst_len(struct smb_rqst *rqst, bool skip_rfc1002_marker); +extern unsigned long smb_rqst_len(struct TCP_Server_Info *server, + struct smb_rqst *rqst); /* * SMB2 Worker functions - most of protocol specific implementation details |