p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cifs: update smb2_calc_size to use smb2_sync_hdr instead of smb2_hdr 

smb2_hdr is just a wrapper around smb2_sync_hdr at this stage
and smb2_hdr is going away.

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Ronnie Sahlberg 2018-06-01 10:53:04 +10:00 committed by Steve French
parent 0d5a288d25
commit 84f0cbfba8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/cifs/smb2misc.c
View File

@ -395,9 +395,8 @@ smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr)
unsigned int unsigned int
smb2_calc_size(void *buf, struct TCP_Server_Info *srvr) smb2_calc_size(void *buf, struct TCP_Server_Info *srvr)
{ {
struct smb2_pdu *pdu = (struct smb2_pdu *)buf; struct smb2_sync_pdu *pdu = (struct smb2_sync_pdu *)buf;
struct smb2_hdr *hdr = &pdu->hdr; struct smb2_sync_hdr *shdr = &pdu->sync_hdr;
struct smb2_sync_hdr *shdr = get_sync_hdr(hdr);
int offset; /* the offset from the beginning of SMB to data area */ int offset; /* the offset from the beginning of SMB to data area */
int data_length; /* the length of the variable length data area */ int data_length; /* the length of the variable length data area */
/* Structure Size has already been checked to make sure it is 64 */ /* Structure Size has already been checked to make sure it is 64 */
@ -412,7 +411,7 @@ smb2_calc_size(void *buf, struct TCP_Server_Info *srvr)
if (has_smb2_data_area[le16_to_cpu(shdr->Command)] == false) if (has_smb2_data_area[le16_to_cpu(shdr->Command)] == false)
goto calc_size_exit; goto calc_size_exit;
smb2_get_data_area_len(&offset, &data_length, hdr); smb2_get_data_area_len(&offset, &data_length, (struct smb2_hdr *)buf);
cifs_dbg(FYI, "SMB2 data length %d offset %d\n", data_length, offset); cifs_dbg(FYI, "SMB2 data length %d offset %d\n", data_length, offset);
if (data_length > 0) { if (data_length > 0) {
@ -420,8 +419,7 @@ smb2_calc_size(void *buf, struct TCP_Server_Info *srvr)
* Check to make sure that data area begins after fixed area, * Check to make sure that data area begins after fixed area,
* Note that last byte of the fixed area is part of data area * Note that last byte of the fixed area is part of data area
* for some commands, typically those with odd StructureSize, * for some commands, typically those with odd StructureSize,
* so we must add one to the calculation (and 4 to account for * so we must add one to the calculation.
* the size of the RFC1001 hdr.
*/ */
if (offset + srvr->vals->header_preamble_size + 1 < len) { if (offset + srvr->vals->header_preamble_size + 1 < len) {
cifs_dbg(VFS, "data area offset %zu overlaps SMB2 header %d\n", cifs_dbg(VFS, "data area offset %zu overlaps SMB2 header %d\n",