diff options
| author | Andy Whitcroft <apw@shadowen.org> | 2007-05-06 14:49:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:12:53 -0700 |
| commit | 543691a6cd70b606dd9bed5e77b120c5d9c5c506 (patch) | |
| tree | 91d1033d6699e28393c7a2cae63727ac22db92ac | |
| parent | b5637e65ee2cecd344b1f8ff750013f697d3ae16 (diff) | |
| download | linux-3.10-543691a6cd70b606dd9bed5e77b120c5d9c5c506.tar.gz linux-3.10-543691a6cd70b606dd9bed5e77b120c5d9c5c506.tar.bz2 linux-3.10-543691a6cd70b606dd9bed5e77b120c5d9c5c506.zip | |
tty_register_driver: only allocate tty instances when defined
If device->num is zero we attempt to kmalloc() zero bytes. When SLUB is
enabled this returns a null pointer and take that as an allocation failure
and fail the device register. Check for no devices and avoid the
allocation.
[akpm: opportunistic kzalloc() conversion]
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/char/tty_io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 7a32df59490..389da364e6b 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -3720,11 +3720,10 @@ int tty_register_driver(struct tty_driver *driver) if (driver->flags & TTY_DRIVER_INSTALLED) return 0; - if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM)) { - p = kmalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL); + if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) { + p = kzalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL); if (!p) return -ENOMEM; - memset(p, 0, driver->num * 3 * sizeof(void *)); } if (!driver->major) { |