rpms/kernel
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CVE-2019-12456 (rhbz 1717182 1717183)

Browse source
This commit is contained in:
Justin M. Forbes 2019-06-05 07:34:39 -05:00
commit 8cd2e444d1
2 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel.spec
View file

@ -613,6 +613,9 @@ Patch534: clk-sunxi-fix-a-missing-check-bug-in-sunxi_divs_clk_setup.patch
# CVE-2019-12454 rhbz 1716996 1717003
Patch535: wcd9335-fix-a-incorrect-use-of-kstrndup.patch
# CVE-2019-12456 rhbz 1717182 1717183
Patch536: scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch
# END OF PATCH DEFINITIONS
%endif
@ -1851,6 +1854,9 @@ fi
#
#
%changelog
* Wed Jun 05 2019 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix CVE-2019-12456 (rhbz 1717182 1717183)
* Tue Jun 04 2019 Jeremy Cline <jcline@redhat.com> - 5.1.7-200
- Linux v5.1.7
- Fix CVE-2019-12455 (rhbz 1716990 1717003)

43
scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch Normal file
View file

@ -0,0 +1,43 @@
From 86e5aca7fa2927060839f3e3b40c8bd65a7e8d1e Mon Sep 17 00:00:00 2001
From: Gen Zhang <blackgod016574@gmail.com>
Date: Thu, 30 May 2019 09:10:30 +0800
Subject: scsi: mpt3sas_ctl: fix double-fetch bug in _ctl_ioctl_main()
In _ctl_ioctl_main(), 'ioctl_header' is fetched the first time from
userspace. 'ioctl_header.ioc_number' is then checked. The legal result is
saved to 'ioc'. Then, in condition MPT3COMMAND, the whole struct is fetched
again from the userspace. Then _ctl_do_mpt_command() is called, 'ioc' and
'karg' as inputs.
However, a malicious user can change the 'ioc_number' between the two
fetches, which will cause a potential security issues. Moreover, a
malicious user can provide a valid 'ioc_number' to pass the check in first
fetch, and then modify it in the second fetch.
To fix this, we need to recheck the 'ioc_number' in the second fetch.
Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
Acked-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index b2bb47c14d35..5181c03e82a6 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -2319,6 +2319,10 @@ _ctl_ioctl_main(struct file *file, unsigned int cmd, void __user *arg,
break;
}
+ if (karg.hdr.ioc_number != ioctl_header.ioc_number) {
+ ret = -EINVAL;
+ break;
+ }
if (_IOC_SIZE(cmd) == sizeof(struct mpt3_ioctl_command)) {
uarg = arg;
ret = _ctl_do_mpt_command(ioc, karg, &uarg->mf);
--
cgit 1.2-0.3.lf.el7