From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 24 Sep 2013 22:27:44 +0000 (-0700)
Subject: cpqarray: fix info leak in ida_locked_ioctl()
X-Git-Tag: v3.0.100~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcad3ae646c253f445658d695f3e1f3ba0f2ac69;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index b2fceb53e8092..e1ac6d202141f 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;