From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com ([209.85.221.52]:44216 "EHLO mail-wr1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728858AbeLTVKY (ORCPT ); Thu, 20 Dec 2018 16:10:24 -0500 Received: by mail-wr1-f52.google.com with SMTP id z5so3166664wrt.11 for ; Thu, 20 Dec 2018 13:10:23 -0800 (PST) Date: Thu, 20 Dec 2018 21:10:20 +0000 From: Sudip Mukherjee To: gregkh@linuxfoundation.org Cc: dan.carpenter@oracle.com, aaptel@suse.com, stable@vger.kernel.org, stfrench@microsoft.com Subject: Re: FAILED: patch "[PATCH] cifs: integer overflow in in SMB2_ioctl()" failed to apply to 4.14-stable tree Message-ID: <20181220211020.ciu5nufmudwacotq@debian> References: <153773088322534@kroah.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="enbr6e2th6v7cd45" Content-Disposition: inline In-Reply-To: <153773088322534@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: --enbr6e2th6v7cd45 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Greg, On Sun, Sep 23, 2018 at 09:28:03PM +0200, gregkh@linuxfoundation.org wrote: > > The patch below does not apply to the 4.14-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . The attached backported patch will apply to 4.14-stable tree. -- Regards Sudip --enbr6e2th6v7cd45 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-cifs-integer-overflow-in-in-SMB2_ioctl.patch" >>From 1a302acd2676a5ee24287dcc435a61b8ff38de7e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 10 Sep 2018 14:12:07 +0300 Subject: [PATCH] cifs: integer overflow in in SMB2_ioctl() commit 2d204ee9d671327915260071c19350d84344e096 upstream The "le32_to_cpu(rsp->OutputOffset) + *plen" addition can overflow and wrap around to a smaller value which looks like it would lead to an information leak. Fixes: 4a72dafa19ba ("SMB2 FSCTL and IOCTL worker function") Signed-off-by: Dan Carpenter Signed-off-by: Steve French Reviewed-by: Aurelien Aptel CC: Stable Signed-off-by: Sudip Mukherjee --- fs/cifs/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 69309538ffb8..87297323d50b 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2020,14 +2020,14 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, /* We check for obvious errors in the output buffer length and offset */ if (*plen == 0) goto ioctl_exit; /* server returned no data */ - else if (*plen > 0xFF00) { + else if (*plen > rsp_iov.iov_len || *plen > 0xFF00) { cifs_dbg(VFS, "srv returned invalid ioctl length: %d\n", *plen); *plen = 0; rc = -EIO; goto ioctl_exit; } - if (get_rfc1002_length(rsp) < le32_to_cpu(rsp->OutputOffset) + *plen) { + if (get_rfc1002_length(rsp) - *plen < le32_to_cpu(rsp->OutputOffset)) { cifs_dbg(VFS, "Malformed ioctl resp: len %d offset %d\n", *plen, le32_to_cpu(rsp->OutputOffset)); *plen = 0; -- 2.11.0 --enbr6e2th6v7cd45--