git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
drivers
/
ide
/
ide-ioctls.c
diff --git
a/drivers/ide/ide-ioctls.c
b/drivers/ide/ide-ioctls.c
index
82f252c
..
e246d3d
100644
(file)
--- a/
drivers/ide/ide-ioctls.c
+++ b/
drivers/ide/ide-ioctls.c
@@
-64,7
+64,8
@@
static int ide_get_identity_ioctl(ide_drive_t *drive, unsigned int cmd,
goto out;
}
- id = kmalloc(size, GFP_KERNEL);
+ /* ata_id_to_hd_driveid() relies on 'id' to be fully allocated. */
+ id = kmalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
if (id == NULL) {
rc = -ENOMEM;
goto out;