[PATCH] Fix root hole in raw device

[Greg KH]

[PATCH] Fix root hole in raw device

[Patch] Fix raw device ioctl pass-through

Raw character devices are supposed to pass ioctls through to the block
devices they are bound to.  Unfortunately, they are using the wrong
function for this: ioctl_by_bdev(), instead of blkdev_ioctl().

ioctl_by_bdev() performs a set_fs(KERNEL_DS) before calling the ioctl,
redirecting the user-space buffer access to the kernel address space.
This is, needless to say, a bad thing.

This was noticed first on s390, where raw IO was non-functioning.  The
s390 driver config does not actually allow raw IO to be enabled, which
was the first part of the problem.  Secondly, the s390 kernel address
space is distinct from user, causing legal raw ioctls to fail.  I've
reproduced this on a kernel built with 4G:4G split on x86, which fails
in the same way (-EFAULT if the address does not exist kernel-side;
returns success without actually populating the user buffer if it does.)

The patch below fixes both the config and address-space problems.  It's
based closely on a patch by Jan Glauber <jang@xxxxxxxxxx>, which has
been tested on s390 at IBM.  I've tested it on x86 4G:4G (split address
space) and x86_64 (common address space).

Kernel-address-space access has been assigned CAN-2005-1264.

Signed-off-by: Stephen Tweedie <sct@xxxxxxxxxx>
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
commit 68f66feb300423bb9ee5daecb1951af394425a38
tree ae5ce87f061f76da06cb78ce5c9cf3c8284fc0fc
parent a84a505956f5c795a9ab3d60d97b6b91a27aa571
author Stephen Tweedie <sct@xxxxxxxxxx> Fri, 13 May 2005 23:31:19 -0400
committer Greg KH <gregkh@xxxxxxx> Mon, 16 May 2005 21:07:21 -0700

 drivers/block/ioctl.c |    2 ++
 drivers/char/raw.c    |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: drivers/block/ioctl.c
===================================================================
--- 440fdf47fcddf8b0d615667b418981a511d16e30/drivers/block/ioctl.c  (mode:100644)
+++ ae5ce87f061f76da06cb78ce5c9cf3c8284fc0fc/drivers/block/ioctl.c  (mode:100644)
@@ -237,3 +237,5 @@
 	}
 	return ret;
 }
+
+EXPORT_SYMBOL_GPL(blkdev_ioctl);
Index: drivers/char/raw.c
===================================================================
--- 440fdf47fcddf8b0d615667b418981a511d16e30/drivers/char/raw.c  (mode:100644)
+++ ae5ce87f061f76da06cb78ce5c9cf3c8284fc0fc/drivers/char/raw.c  (mode:100644)
@@ -122,7 +122,7 @@
 {
 	struct block_device *bdev = filp->private_data;
 
-	return ioctl_by_bdev(bdev, command, arg);
+	return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
 }
 
 static void bind_device(struct raw_config_request *rq)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/