aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo2013-02-27 19:04:04 -0600
committerGreg Kroah-Hartman2013-03-03 16:09:04 -0600
commitcbf253c44b52b3c6b921a22f05243a1dc7a00122 (patch)
tree213ab20188e0b5849030e031ca43ff6e463be5c2
parent4ec348232dc21cf79b62f32e0bdb099c9d817941 (diff)
downloadkernel-common-cbf253c44b52b3c6b921a22f05243a1dc7a00122.tar.gz
kernel-common-cbf253c44b52b3c6b921a22f05243a1dc7a00122.tar.xz
kernel-common-cbf253c44b52b3c6b921a22f05243a1dc7a00122.zip
firewire: add minor number range check to fw_device_init()
commit 3bec60d511179853138836ae6e1b61fe34d9235f upstream. fw_device_init() didn't check whether the allocated minor number isn't too large. Fail if it goes overflows MINORBITS. Signed-off-by: Tejun Heo <tj@kernel.org> Suggested-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/firewire/core-device.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 9f661e06931..812cea37a5b 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -995,6 +995,10 @@ static void fw_device_init(struct work_struct *work)
995 ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? 995 ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ?
996 idr_get_new(&fw_device_idr, device, &minor) : 996 idr_get_new(&fw_device_idr, device, &minor) :
997 -ENOMEM; 997 -ENOMEM;
998 if (minor >= 1 << MINORBITS) {
999 idr_remove(&fw_device_idr, minor);
1000 minor = -ENOSPC;
1001 }
998 up_write(&fw_device_rwsem); 1002 up_write(&fw_device_rwsem);
999 1003
1000 if (ret < 0) 1004 if (ret < 0)