diff options
| author | Tejun Heo <tj@kernel.org> | 2013-02-28 02:04:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 04:10:15 +0100 |
| commit | 3bec60d511179853138836ae6e1b61fe34d9235f (patch) | |
| tree | ce8ced19f2d85483f84472573d38e0a6ec70fa83 | |
| parent | dmaengine: convert to idr_alloc() (diff) | |
| download | linux-3bec60d511179853138836ae6e1b61fe34d9235f.tar.xz linux-3bec60d511179853138836ae6e1b61fe34d9235f.zip | |
firewire: add minor number range check to fw_device_init()
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/firewire/core-device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index 3873d535b28d..af3e8aa5eedc 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -1020,6 +1020,10 @@ static void fw_device_init(struct work_struct *work) ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? idr_get_new(&fw_device_idr, device, &minor) : -ENOMEM; + if (minor >= 1 << MINORBITS) { + idr_remove(&fw_device_idr, minor); + minor = -ENOSPC; + } up_write(&fw_device_rwsem); if (ret < 0) |