Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbdFSSer (ORCPT + 2 others); Mon, 19 Jun 2017 14:34:47 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:51900 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752594AbdFSSeo (ORCPT ); Mon, 19 Jun 2017 14:34:44 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Pavel Shilovsky , Willy Tarreau Subject: [PATCH 3.10 023/268] CIFS: Fix a possible memory corruption in push locks Date: Mon, 19 Jun 2017 20:28:42 +0200 Message-Id: <1497897167-14556-24-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1497897167-14556-1-git-send-email-w@1wt.eu> References: <1497897167-14556-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Pavel Shilovsky 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: Willy Tarreau --- 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 d801f63..866caf1 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -266,7 +266,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.8.0.rc2.1.gbe9624a