summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorMatthew Daley <mattd@bugfuzz.com>2014-04-28 19:05:21 +1200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-13 13:32:47 +0200
commitb487c62505afbd87654773562fbf2e89bcd52147 (patch)
tree997f93f51ebe877878dda0dce3aa3c2f5f64ef5f /drivers/block
parentfb9a2011887416ffdc576d10711dc196343aab69 (diff)
downloadlinux-stable-b487c62505afbd87654773562fbf2e89bcd52147.tar.gz
linux-stable-b487c62505afbd87654773562fbf2e89bcd52147.tar.bz2
linux-stable-b487c62505afbd87654773562fbf2e89bcd52147.zip
floppy: don't write kernel-only members to FDRAWCMD ioctl output
commit 2145e15e0557a01b9195d1c7199a1b92cb9be81f upstream. Do not leak kernel-only floppy_raw_cmd structure members to userspace. This includes the linked-list pointer and the pointer to the allocated DMA space. Signed-off-by: Matthew Daley <mattd@bugfuzz.com> 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/floppy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index dcb7427b7db1..dab515cd77bf 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3053,7 +3053,10 @@ static int raw_cmd_copyout(int cmd, void __user *param,
int ret;
while (ptr) {
- ret = copy_to_user(param, ptr, sizeof(*ptr));
+ struct floppy_raw_cmd cmd = *ptr;
+ cmd.next = NULL;
+ cmd.kernel_data = NULL;
+ ret = copy_to_user(param, &cmd, sizeof(cmd));
if (ret)
return -EFAULT;
param += sizeof(struct floppy_raw_cmd);