[PATCH] Some error checking on kmalloc()'s in ide-probe.c

Stephen Shirley (diamond@skynet.ie)
Thu, 14 Jun 2001 14:34:29 +0100 (IST)


Mornin,
This patch adds error checking to the return value of kmalloc() in
2 places in ide-probe.c. It's against 2.4.5.y

Steve

--- ide-probe.c.orig Thu Jun 14 14:05:31 2001
+++ ide-probe.c Thu Jun 14 14:15:12 2001
@@ -58,6 +58,11 @@
struct hd_driveid *id;

id = drive->id = kmalloc (SECTOR_WORDS*4, GFP_ATOMIC); /* called with interrupts disabled! */
+ if(id == NULL)
+ {
+ printk(KERN_ERR "ide-probe: Failed to allocate memory for hd_driveid struct, aborting\n");
+ return;
+ }
ide_input_data(drive, id, SECTOR_WORDS); /* read 512 bytes of id info */
ide__sti(); /* local CPU only */
ide_fix_driveid(id);
@@ -623,6 +628,11 @@
/* Allocate the buffer and potentially sleep first */

new_hwgroup = kmalloc(sizeof(ide_hwgroup_t),GFP_KERNEL);
+ if(new_hwgroup == NULL)
+ {
+ printk(KERN_ERR "ide-probe: Failed to allocate memory for hwgroup, aborting\n");
+ return 1;
+ }

save_flags(flags); /* all CPUs */
cli(); /* all CPUs */

-- 
"My mom had Windows at work and it hurt her eyes real bad"

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/