History

floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl

The final field of a floppy_struct is the field "name", which is a pointer to a string in kernel memory. The kernel pointer should not be copied to user memory. The FDGETPRM ioctl copies a floppy_struct to user memory, including this "name" field. This pointer cannot be used by the user and it will leak a kernel address to user-space, which will reveal the location of kernel code and data and undermine KASLR protection. Model this code after the compat ioctl which copies the returned data to a previously cleared temporary structure on the stack (excluding the name pointer) and copy out to userspace from there. As we already have an inparam union with an appropriate member and that memory is already cleared even for read only calls make use of that as a temporary store. Based on an initial patch by Brian Belleville. CVE-2018-7755 Signed-off-by: Andy Whitcroft <apw@canonical.com> Broke up long line.

Andy Whitcroft committed 8 years ago

Commit 65eea8e1 parent 7ce5c8c1 file · +3 −0Browse files

Unified · Split

drivers/block/floppy.c+3−0
@@ -3467,6 +3467,9 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int · 3466 unmodified lines
3467 (struct floppy_struct **)&outparam);3467 (struct floppy_struct **)&outparam);
3468 if (ret)3468 if (ret)
3469 return ret;3469 return ret;
3470 memcpy(&inparam.g, outparam,
3471 offsetof(struct floppy_struct, name));
3472 outparam = &inparam.g;
3470 break;3473 break;
3471 case FDMSGON:3474 case FDMSGON:
3472 UDP->flags |= FTD_MSG;3475 UDP->flags |= FTD_MSG;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t