FAILED: patch "[PATCH] cifs: integer overflow in in SMB2_ioctl()" failed to apply to 4.14-stable tree
[email protected]
maintainerThe 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 <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
2d204ee9d671327915260071c19350d84344e096Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Mon, 10 Sep 2018 14:12:07 +0300
Subject: [PATCH] cifs: integer overflow in in SMB2_ioctl()
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.
fs/cifs/smb2pdu.c +2 -2
@@ -2459,14 +2459,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 (rsp_iov.iov_len <le32_to_cpu (rsp->OutputOffset) + *plen) { +if (rsp_iov.iov_len - *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 ;
Sudip Mukherjee
Reviewed-by Aurelien AptelHi Greg,
Quoted 5 lines · On Sun, Sep 23, 2018 at 09:28:03PM +0200, [email protected] 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 <[email protected]>.
The attached backported patch will apply to 4.14-stable tree.
--
Regards
Sudip
Quoted 1 line
From
1a302acd2676a5ee24287dcc435a61b8ff38de7eMon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
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.
--- fs/cifs/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +2 -2
@@ -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 ;
Signature · 1 line
2.11.0
Quoted 10 lines · Sudip Mukherjee
Hi Greg,
Quoted 5 lines · On Sun, Sep 23, 2018 at 09:28:03PM +0200, [email protected] 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 <[email protected]>.The attached backported patch will apply to 4.14-stable tree.
Queued for all <=4.14, thank you.
--
Thanks,
Sasha
Greg KH
maintainerQuoted 5 lines · Sasha Levin
Quoted 4 lines · Sudip Mukherjee
Hi Greg,
Quoted 1 line · On Sun, Sep 23, 2018 at 09:28:03PM +0200, [email protected] wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
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 <[email protected]>.The attached backported patch will apply to 4.14-stable tree.
Queued for all <=4.14, thank you.
It breaks the build on < 4.14 so I'm dropping it from those...
thanks,
greg k-h