diff options
author | Matthew Daley <mattd@bugfuzz.com> | 2014-04-28 19:05:21 +1200 |
---|---|---|
committer | Stefan Bader <stefan.bader@canonical.com> | 2014-05-20 16:35:18 +0200 |
commit | 59b1c4bc3aa801c8f8ce745d223b8299ff94f1f4 (patch) | |
tree | df2006edf19dcee8b3f3ddd2b65880a49a342ff1 | |
parent | 1ffbc27fdac9754b46e9aff68ae0fe5a644e8d3e (diff) | |
download | linux-2.6.32.y-drm33.z-59b1c4bc3aa801c8f8ce745d223b8299ff94f1f4.tar.gz |
floppy: don't write kernel-only members to FDRAWCMD ioctl output
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>
(cherry picked from commit 2145e15e0557a01b9195d1c7199a1b92cb9be81f)
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
-rw-r--r-- | drivers/block/floppy.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 19d45e6c2b9b00..f959aad30ca1e1 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3162,7 +3162,12 @@ static inline int raw_cmd_copyout(int cmd, char __user *param, int ret; while (ptr) { - COPYOUT(*ptr); + struct floppy_raw_cmd cmd = *ptr; + cmd.next = NULL; + cmd.kernel_data = NULL; + ret = copy_to_user((void __user *)param, &cmd, sizeof(cmd)); + if (ret) + return -EFAULT; param += sizeof(struct floppy_raw_cmd); if ((ptr->flags & FD_RAW_READ) && ptr->buffer_length) { if (ptr->length >= 0 |