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

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

Post by Stephen Shirle » Fri, 15 Jun 2001 22:40:11



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

        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 */

        /* 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

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

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

Post by Alan Co » Sat, 16 Jun 2001 02:30:10


Quote:> 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

These are already fixed in the -ac tree

Please people - check the -ac tree before wasting time on these

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

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

Post by Stephen Shirle » Sat, 16 Jun 2001 19:10:10



> These are already fixed in the -ac tree

> Please people - check the -ac tree before wasting time on these

Hmm - I did indeed forget to check the -ac tree, I have done so now, and
there is no difference between the vanilla kernel and the -ac one in
those places that i can see. The second fix is not needed after closer
inspection (mea culpa), but the first is still valid AFAICS.

Steve
Ps. Apologise if I've fumbled it again.

--- ide-probe.c.orig    Thu Jun 14 14:05:31 2001

        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);

--
"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

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/