summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorVasiliy Kulikov2011-01-07 17:55:53 +0100
committerJames Bottomley2011-01-24 18:34:05 +0100
commit938abd8449c27fc67203e1a7c350199cea1158da (patch)
tree9df0d8a955d7c874010db02bcefa59e73ff941aa /drivers/scsi
parent[SCSI] hpsa: Fix problem that CMD_UNABORTABLE command status was treated as u... (diff)
downloadkernel-qcow2-linux-938abd8449c27fc67203e1a7c350199cea1158da.tar.gz
kernel-qcow2-linux-938abd8449c27fc67203e1a7c350199cea1158da.tar.xz
kernel-qcow2-linux-938abd8449c27fc67203e1a7c350199cea1158da.zip
[SCSI] hpsa: avoid leaking stack contents to userland
memset arg64 to zero in the passthrough ioctls to avoid leaking contents of kernel stack memory to userland via uninitialized padding fields inserted by the compiler for alignment reasons. Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/hpsa.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 5828bcb82964..959eeb202d92 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2310,6 +2310,7 @@ static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, void *arg)
int err;
u32 cp;
+ memset(&arg64, 0, sizeof(arg64));
err = 0;
err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
sizeof(arg64.LUN_info));
@@ -2346,6 +2347,7 @@ static int hpsa_ioctl32_big_passthru(struct scsi_device *dev,
int err;
u32 cp;
+ memset(&arg64, 0, sizeof(arg64));
err = 0;
err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
sizeof(arg64.LUN_info));