diff options
| author | Matthew Daley <mattd@bugfuzz.com> | 2014-04-28 19:05:20 +1200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-05-18 14:58:09 +0100 |
| commit | d79119d4089defc81a49c6a7e26ff5ff86f4b342 (patch) | |
| tree | d93ea3f7c0f9160026aab327b3582a5d5770f5a6 | |
| parent | 1e5099713cefc67aa562f6d8fe43444f41baf52d (diff) | |
floppy: ignore kernel-only members in FDRAWCMD ioctl input
commit ef87dbe7614341c2e7bfe8d32fcb7028cc97442c upstream.
Always clear out these floppy_raw_cmd struct members after copying the
entire structure from userspace so that the in-kernel version is always
valid and never left in an interdeterminate state.
Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/block/floppy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 7a90d4ae6e52..56490fe6c0eb 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3114,10 +3114,11 @@ loop: return -ENOMEM; *rcmd = ptr; ret = copy_from_user(ptr, param, sizeof(*ptr)); - if (ret) - return -EFAULT; ptr->next = NULL; ptr->buffer_length = 0; + ptr->kernel_data = NULL; + if (ret) + return -EFAULT; param += sizeof(struct floppy_raw_cmd); if (ptr->cmd_count > 33) /* the command may now also take up the space @@ -3133,7 +3134,6 @@ loop: for (i = 0; i < 16; i++) ptr->reply[i] = 0; ptr->resultcode = 0; - ptr->kernel_data = NULL; if (ptr->flags & (FD_RAW_READ | FD_RAW_WRITE)) { if (ptr->length <= 0) |