summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-06-27 15:51:38 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-06-29 18:17:52 -0400
commit30138384dae74cdd5694615c098a19af984a3dda (patch)
tree88f528ca5ea0c9cd09c2c612a587a1b263628ae0 /block
parent229b53c9bf4e1132a4aa6feb9632a7a1f1d08c5c (diff)
downloadop-kernel-dev-30138384dae74cdd5694615c098a19af984a3dda.zip
op-kernel-dev-30138384dae74cdd5694615c098a19af984a3dda.tar.gz
compat_hdio_ioctl: get rid of set_fs()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block')
-rw-r--r--block/compat_ioctl.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 696e0cd..38554c2 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -79,19 +79,16 @@ static int compat_hdio_getgeo(struct gendisk *disk, struct block_device *bdev,
static int compat_hdio_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
- mm_segment_t old_fs = get_fs();
- unsigned long kval;
- unsigned int __user *uvp;
+ unsigned long *__user p;
int error;
- set_fs(KERNEL_DS);
+ p = compat_alloc_user_space(sizeof(unsigned long));
error = __blkdev_driver_ioctl(bdev, mode,
- cmd, (unsigned long)(&kval));
- set_fs(old_fs);
-
+ cmd, (unsigned long)p);
if (error == 0) {
- uvp = compat_ptr(arg);
- if (put_user(kval, uvp))
+ unsigned int __user *uvp = compat_ptr(arg);
+ unsigned long v;
+ if (get_user(v, p) || put_user(v, uvp))
error = -EFAULT;
}
return error;
OpenPOWER on IntegriCloud