Re: [PATCH] CIFS: Fix maximum SMB2 header size

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



merged into cifs-2.6.git for-next

On Fri, Aug 25, 2017 at 4:05 AM, Sachin Prabhu <sprabhu@xxxxxxxxxx> wrote:
> Tested it successfully with a reproducer listed in rh bz 1484099.
>
> # mkdir t1; for i in {1..1000}; do touch t1/aaaaaaaaaaaaaaaaaaaa$i; done
> # find t1
>
> Acked-by: Sachin Prabhu <sprabhu@xxxxxxxxxx>
>
> On Thu, Aug 24, 2017 at 11:16 PM, Pavel Shilovsky <pshilov@xxxxxxxxxxxxx>
> wrote:
>>
>> Currently the maximum size of SMB2/3 header is set incorrectly which
>> leads to hanging of directory listing operations on encrypted SMB3
>> connections. Fix this by setting the maximum size to 170 bytes that
>> is calculated as RFC1002 length field size (4) + transform header
>> size (52) + SMB2 header size (64) + create response size (56).
>>
>> Cc: <stable@xxxxxxxxxxxxxxx>
>> Signed-off-by: Pavel Shilovsky <pshilov@xxxxxxxxxxxxx>
>> ---
>>  fs/cifs/smb2pdu.h | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
>> index 18700fd..2826882 100644
>> --- a/fs/cifs/smb2pdu.h
>> +++ b/fs/cifs/smb2pdu.h
>> @@ -84,8 +84,8 @@
>>
>>  #define NUMBER_OF_SMB2_COMMANDS        0x0013
>>
>> -/* BB FIXME - analyze following length BB */
>> -#define MAX_SMB2_HDR_SIZE 0x78 /* 4 len + 64 hdr + (2*24 wct) + 2 bct + 2
>> pad */
>> +/* 4 len + 52 transform hdr + 64 hdr + 56 create rsp */
>> +#define MAX_SMB2_HDR_SIZE 0x00b0
>>
>>  #define SMB2_PROTO_NUMBER cpu_to_le32(0x424d53fe)
>>  #define SMB2_TRANSFORM_PROTO_NUM cpu_to_le32(0x424d53fd)
>> --
>> 2.7.4
>>
>> --
>> 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
>
>



-- 
Thanks,

Steve
--
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



[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux