diff options
| author | Ronnie Sahlberg | 2018-06-28 02:47:14 +0200 |
|---|---|---|
| committer | Steve French | 2018-07-05 20:48:24 +0200 |
| commit | 81f39f951b8098b1c59b01ad10d06d7dc01c7019 (patch) | |
| tree | 220f25cf5198753014f35ee11a9722d3a7df4e7d /fs/cifs/smb2ops.c | |
| parent | cifs: Fix validation of signed data in smb2 (diff) | |
| download | kernel-qcow2-linux-81f39f951b8098b1c59b01ad10d06d7dc01c7019.tar.gz kernel-qcow2-linux-81f39f951b8098b1c59b01ad10d06d7dc01c7019.tar.xz kernel-qcow2-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/smb2ops.c')
| -rw-r--r-- | fs/cifs/smb2ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index e9216ce88796..04578f6e306b 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -2522,7 +2522,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, struct smb_rqst *new_rq, if (!tr_hdr) goto err_free_iov; - orig_len = smb2_rqst_len(old_rq, false); + orig_len = smb_rqst_len(server, old_rq); /* fill the 2nd iov with a transform header */ fill_transform_hdr(tr_hdr, orig_len, old_rq); |