summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilov@microsoft.com>2016-11-29 16:14:43 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-06 11:16:24 +0100
commitbbf23f00d55e1bfbe105d72780b1242dc9772c6d (patch)
tree8e82002a657c7947a1a79bc52f49bbbc3ca99e76
parent9f1f5076149a534723d7293097656a621f477015 (diff)
downloadlinux-stable-bbf23f00d55e1bfbe105d72780b1242dc9772c6d.tar.gz
linux-stable-bbf23f00d55e1bfbe105d72780b1242dc9772c6d.tar.bz2
linux-stable-bbf23f00d55e1bfbe105d72780b1242dc9772c6d.zip
CIFS: Fix a possible memory corruption in push locks
commit e3d240e9d505fc67f8f8735836df97a794bbd946 upstream. If maxBuf is not 0 but less than a size of SMB2 lock structure we can end up with a memory corruption. Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/cifs/smb2file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
index f9e766f464be..b2aff0c6f22c 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -260,7 +260,7 @@ smb2_push_mandatory_locks(struct cifsFileInfo *cfile)
* and check it for zero before using.
*/
max_buf = tlink_tcon(cfile->tlink)->ses->server->maxBuf;
- if (!max_buf) {
+ if (max_buf < sizeof(struct smb2_lock_element)) {
free_xid(xid);
return -EINVAL;
}