| Message ID | 1399403436-21214-6-git-send-email-apw@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 05/06/2014 12:10 PM, Andy Whitcroft wrote: > From: Matthew Daley <mattd@bugfuzz.com> > > 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) > CVE-2014-1738 > BugLink: http://bugs.launchpad.net/bugs/1316735 > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > drivers/block/floppy.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c > index 10fbd3f..738af94 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); >
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 10fbd3f..738af94 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);