leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: fix over-copying of getbmap parameters from userspace

Browse Source 
In xfs_ioc_getbmap, we should only copy the fields of struct getbmap
from userspace, or else we end up copying random stack contents into the
kernel.  struct getbmap is a strict subset of getbmapx, so a partial
structure copy should work fine.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2017-04-03 15:17:57 -07:00
parent 422e5b53ed
commit be6324c00c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/xfs/xfs_ioctl.c
View File

@ -1543,10 +1543,11 @@ xfs_ioc_getbmap(
unsigned int cmd, unsigned int cmd,
void __user *arg) void __user *arg)
{ {
struct getbmapx bmx; struct getbmapx bmx = { 0 };
int error; int error;
if (copy_from_user(&bmx, arg, sizeof(struct getbmapx))) /* struct getbmap is a strict subset of struct getbmapx. */
if (copy_from_user(&bmx, arg, offsetof(struct getbmapx, bmv_iflags)))
return -EFAULT; return -EFAULT;
if (bmx.bmv_count < 2) if (bmx.bmv_count < 2)