2018-05-31 17:53 GMT-07:00 Ronnie Sahlberg <lsahlber@xxxxxxxxxx>:
> Signed-off-by: Ronnie Sahlberg <lsahlber@xxxxxxxxxx>
> ---
> fs/cifs/smb2misc.c | 37 +++++++++++++++++++------------------
> fs/cifs/smb2pdu.c | 2 +-
> fs/cifs/smb2proto.h | 3 ++-
> 3 files changed, 22 insertions(+), 20 deletions(-)
>
> diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c
> index 50f94d75cc40..d9a90e75c839 100644
> --- a/fs/cifs/smb2misc.c
> +++ b/fs/cifs/smb2misc.c
> @@ -295,15 +295,14 @@ static const bool has_smb2_data_area[NUMBER_OF_SMB2_COMMANDS] = {
> * area and the offset to it (from the beginning of the smb are also returned.
> */
> char *
> -smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr)
> +smb2_get_data_area_len(int *off, int *len, struct smb2_sync_hdr *shdr)
> {
> - struct smb2_sync_hdr *shdr = get_sync_hdr(hdr);
> *off = 0;
> *len = 0;
>
> /* error responses do not have data area */
> if (shdr->Status && shdr->Status != STATUS_MORE_PROCESSING_REQUIRED &&
> - (((struct smb2_err_rsp *)hdr)->StructureSize) ==
> + (((struct smb2_err_rsp *)shdr)->StructureSize) ==
> SMB2_ERROR_STRUCTURE_SIZE2)
> return NULL;
>
> @@ -315,42 +314,44 @@ smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr)
> switch (shdr->Command) {
> case SMB2_NEGOTIATE:
> *off = le16_to_cpu(
> - ((struct smb2_negotiate_rsp *)hdr)->SecurityBufferOffset);
> + ((struct smb2_negotiate_rsp *)shdr)->SecurityBufferOffset);
> *len = le16_to_cpu(
> - ((struct smb2_negotiate_rsp *)hdr)->SecurityBufferLength);
> + ((struct smb2_negotiate_rsp *)shdr)->SecurityBufferLength);
> break;
> case SMB2_SESSION_SETUP:
> *off = le16_to_cpu(
> - ((struct smb2_sess_setup_rsp *)hdr)->SecurityBufferOffset);
> + ((struct smb2_sess_setup_rsp *)shdr)->SecurityBufferOffset);
> *len = le16_to_cpu(
> - ((struct smb2_sess_setup_rsp *)hdr)->SecurityBufferLength);
> + ((struct smb2_sess_setup_rsp *)shdr)->SecurityBufferLength);
> break;
> case SMB2_CREATE:
> *off = le32_to_cpu(
> - ((struct smb2_create_rsp *)hdr)->CreateContextsOffset);
> + ((struct smb2_create_rsp *)shdr)->CreateContextsOffset);
> *len = le32_to_cpu(
> - ((struct smb2_create_rsp *)hdr)->CreateContextsLength);
> + ((struct smb2_create_rsp *)shdr)->CreateContextsLength);
> break;
> case SMB2_QUERY_INFO:
> *off = le16_to_cpu(
> - ((struct smb2_query_info_rsp *)hdr)->OutputBufferOffset);
> + ((struct smb2_query_info_rsp *)shdr)->OutputBufferOffset);
> *len = le32_to_cpu(
> - ((struct smb2_query_info_rsp *)hdr)->OutputBufferLength);
> + ((struct smb2_query_info_rsp *)shdr)->OutputBufferLength);
> break;
> case SMB2_READ:
> - *off = ((struct smb2_read_rsp *)hdr)->DataOffset;
> - *len = le32_to_cpu(((struct smb2_read_rsp *)hdr)->DataLength);
> + /* TODO: is this a bug ? */
Do we need this comment?
--
Best regards,
Pavel Shilovsky
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
