From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Pavel Shilovsky <pshilov@microsoft.com>,
Steve French <smfrench@gmail.com>,
Sachin Prabhu <sprabhu@redhat.com>
Subject: [PATCH 4.12 16/27] CIFS: Fix maximum SMB2 header size
Date: Tue, 5 Sep 2017 09:11:32 +0200 [thread overview]
Message-ID: <20170905070923.874276715@linuxfoundation.org> (raw)
In-Reply-To: <20170905070923.265950493@linuxfoundation.org>
4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Shilovsky <pshilov@microsoft.com>
commit 9e37b1784f2be9397a903307574ee565bbadfd75 upstream.
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).
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/cifs/smb2pdu.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- 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)
next prev parent reply other threads:[~2017-09-05 7:15 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 7:11 [PATCH 4.12 00/27] 4.12.11-stable review Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 01/27] arm64: mm: abort uaccess retries upon fatal signal Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 03/27] irqchip: mips-gic: SYNC after enabling GIC region Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 04/27] Input: synaptics - fix device info appearing different on reconnect Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 05/27] Input: xpad - fix PowerA init quirk for some gamepad models Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 06/27] crypto: chacha20 - fix handling of chunked input Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 07/27] i2c: ismt: Dont duplicate the receive length for block reads Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 08/27] i2c: ismt: Return EMSGSIZE for block reads with bogus length Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 09/27] crypto: algif_skcipher - only call put_page on referenced and used pages Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 10/27] mm, uprobes: fix multiple free of ->uprobes_state.xol_area Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 11/27] mm, madvise: ensure poisoned pages are removed from per-cpu lists Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 12/27] ceph: fix readpage from fscache Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 13/27] cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 14/27] cpuset: Fix incorrect memory_pressure control file mapping Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 15/27] alpha: uapi: Add support for __SANE_USERSPACE_TYPES__ Greg Kroah-Hartman
2017-09-05 7:11 ` Greg Kroah-Hartman [this message]
2017-09-05 7:11 ` [PATCH 4.12 17/27] CIFS: remove endian related sparse warning Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 18/27] dm mpath: do not lock up a CPU with requeuing activity Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 19/27] drm/vmwgfx: Fix F26 Wayland screen update issue Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 20/27] wl1251: add a missing spin_lock_init() Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 21/27] mmc: sdhci-xenon: add set_power callback Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 22/27] lib/mpi: kunmap after finishing accessing buffer Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 23/27] xfrm: policy: check policy direction value Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 25/27] nvme: fix the definition of the doorbell buffer config support bit Greg Kroah-Hartman
2017-09-05 7:11 ` [PATCH 4.12 26/27] drm/nouveau/i2c/gf119-: add support for address-only transactions Greg Kroah-Hartman
2017-09-05 16:48 ` [PATCH 4.12 00/27] 4.12.11-stable review Guenter Roeck
2017-09-05 17:40 ` Greg Kroah-Hartman
2017-09-05 17:15 ` Shuah Khan
2017-09-05 17:40 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170905070923.874276715@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pshilov@microsoft.com \
--cc=smfrench@gmail.com \
--cc=sprabhu@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).