From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:55401 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751167AbdAMHn6 (ORCPT ); Fri, 13 Jan 2017 02:43:58 -0500 From: Jiri Slaby To: stable@vger.kernel.org Cc: Pavel Shilovsky , Jiri Slaby Subject: [patch added to 3.12-stable] CIFS: Fix a possible memory corruption in push locks Date: Fri, 13 Jan 2017 08:41:56 +0100 Message-Id: <20170113074159.26811-30-jslaby@suse.cz> In-Reply-To: <20170113074159.26811-1-jslaby@suse.cz> References: <20170113074159.26811-1-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Pavel Shilovsky This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== 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 Signed-off-by: Jiri Slaby --- fs/cifs/smb2file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.11.0