diff options
Diffstat (limited to 'scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch')
| -rw-r--r-- | scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch b/scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch deleted file mode 100644 index 7e282fe11..000000000 --- a/scsi-mpt3sas_ctl-fix-double-fetch-bug-in_ctl_ioctl_main.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 - |