diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-12-07 19:57:15 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2014-12-13 15:16:20 +0100 |
| commit | a99c4d9b097701ce465042c61d7eabf1ff26b4ae (patch) | |
| tree | ca7c9ba8338bb2e5f6d7a9144ddda15ea8eab355 | |
| parent | d22e4c7890e18c3c6565fca208a9ac910a6f8bf5 (diff) | |
cciss: Fix misapplied "cciss: fix info leak in cciss_ioctl32_passthru()"
Upstream commit 58f09e00ae09 was applied to the wrong function when
cherry-picked for 2.6.32.61.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | drivers/block/cciss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index b2225ab0d604..d4d165a8963e 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1011,6 +1011,7 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode, int err; u32 cp; + memset(&arg64, 0, sizeof(arg64)); err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, @@ -1051,7 +1052,6 @@ static int cciss_ioctl32_big_passthru(struct block_device *bdev, fmode_t mode, int err; u32 cp; - memset(&arg64, 0, sizeof(arg64)); err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, |