---

yaml --- r: 154575 b: refs/heads/master c: e18ed14 h: refs/heads/master i: 154573: a709182 154571: 775cabe 154567: 3d35e69 154559: d66d186 v: v3
git-mirror · Jun 30, 2009 · cfed108 · cfed108
1 parent bce7032
commit cfed108
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf427b25b79eb7cea27963a66c3d4684cae0e0c
+refs/heads/master: e18ed145c7f556f1de8350c32739bf35b26df705
diff --git a/trunk/drivers/ide/ide-ioctls.c b/trunk/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;