summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilov@microsoft.com>2016-11-29 16:14:43 -0800
committerBen Hutchings <ben@decadent.org.uk>2017-03-16 02:26:29 +0000
commit6359e20b91dd72fc5268f61ceb9dea9775d96555 (patch)
tree773e60c5b7cf314003a41a5cd65d8dda3f59bd49 /fs
parentb225d49f0342e7a47cd9f69d4b31a9c0d4046679 (diff)
downloadlinux-stable-6359e20b91dd72fc5268f61ceb9dea9775d96555.tar.gz
linux-stable-6359e20b91dd72fc5268f61ceb9dea9775d96555.tar.bz2
linux-stable-6359e20b91dd72fc5268f61ceb9dea9775d96555.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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
-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 45992944e238..b87b07504947 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -241,7 +241,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;
}