diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-12-07 19:57:15 +0000 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-12-15 15:00:59 +0100 |
| commit | 9126993c54283db9e76f6e5f453a42168c96d593 (patch) | |
| tree | 29a5e3f73d2d97fa8739b75b51f2ba084d9bda7d | |
| parent | e9a62d9cb631a146b7547070ee605ee352a39f4e (diff) | |
| download | linux-2.6.32.y-drm33.z-9126993c54283db9e76f6e5f453a42168c96d593.tar.gz | |
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>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -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 b2225ab0d604e5..d4d165a8963ebd 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, |