aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-09-24 15:27:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-13 14:51:06 -0700
commitdcad3ae646c253f445658d695f3e1f3ba0f2ac69 (patch)
tree4723b5ef9abd5e5287f65cc218c98bbb0fe7d9df /drivers/block
parent00dd675556f5c6a17bcba5f7e47c2552daeed84c (diff)
downloadkernel_samsung_smdk4412-dcad3ae646c253f445658d695f3e1f3ba0f2ac69.zip
kernel_samsung_smdk4412-dcad3ae646c253f445658d695f3e1f3ba0f2ac69.tar.gz
kernel_samsung_smdk4412-dcad3ae646c253f445658d695f3e1f3ba0f2ac69.tar.bz2
cpqarray: fix info leak in ida_locked_ioctl()
commit 627aad1c01da6f881e7f98d71fd928ca0c316b1a upstream. The pciinfo struct has a two byte hole after ->dev_fn so stack information could be leaked to the user. This was assigned CVE-2013-2147. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cpqarray.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index b2fceb5..e1ac6d2 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -1195,6 +1195,7 @@ out_passthru:
ida_pci_info_struct pciinfo;
if (!arg) return -EINVAL;
+ memset(&pciinfo, 0, sizeof(pciinfo));
pciinfo.bus = host->pci_dev->bus->number;
pciinfo.dev_fn = host->pci_dev->devfn;
pciinfo.board_id = host->board_id;