diff options
| author |   Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-02-18 01:54:00 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-02-24 20:36:54 +0100 |
| commit | 58aaa5427663b680030aa58aaaf1e2738564b8dc (patch) | |
| tree | d084f4cb49842cefe5e9753cf3050c1171fd4560 /drivers/firewire/core-device.c | |
| parent | firewire: core: don't fail device creation in case of too large config ROM blocks (diff) | |
| download | linux-dev-58aaa5427663b680030aa58aaaf1e2738564b8dc.tar.xz linux-dev-58aaa5427663b680030aa58aaaf1e2738564b8dc.zip | |
firewire: core: increase stack size of config ROM reader
The stack size of 16 was artificially chosen and may be too small in
extreme cases. A device won't be accessible then.
Since it doesn't really matter to the slab allocator whether we ask for
1088 bytes or 2048 bytes of scratch memory, just allocate 2048 bytes for
the sum of temporary config ROM image and stack, and we will never ever
overflow the stack (because there simply can't be more stack items than
ROM entries).
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/core-device.c')
| -rw-r--r-- | drivers/firewire/core-device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index 01cb6a327e29..150a8ba97488 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -493,7 +493,6 @@ static int read_rom(struct fw_device *device, } #define READ_BIB_ROM_SIZE 256 -#define READ_BIB_STACK_SIZE 16 /* * Read the bus info block, perform a speed probe, and read all of the rest of @@ -510,7 +509,7 @@ static int read_bus_info_block(struct fw_device *device, int generation) int i, end, length, ret = -1; rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE + - sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL); + sizeof(*stack) * READ_BIB_ROM_SIZE, GFP_KERNEL); if (rom == NULL) return -ENOMEM; @@ -612,8 +611,7 @@ static int read_bus_info_block(struct fw_device *device, int generation) RCODE_COMPLETE) goto out; - if ((key >> 30) != 3 || (rom[i] >> 30) < 2 || - sp >= READ_BIB_STACK_SIZE) + if ((key >> 30) != 3 || (rom[i] >> 30) < 2) continue; /* * Offset points outside the ROM. May be a firmware |