lkml.org 
[lkml]   [2001]   [May]   [25]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
FromPraveen Srinivasan <>
SubjectRe: [PATCH] sd.c - null ptr fixes for 2.4.4
DateThu, 24 May 2001 22:55:09 -0700
Here is a revised patch. Did you mean "free SRpnt" by "surely you need to 
return the request"? The function returns an int. If that is what you 
meant, our revised patch fixes that.

Thanks,
Praveen Srinivasan and Frederick Akalin


--- ./drivers/scsi/sd.c.old     Sat Feb  3 11:45:55 2001
+++ ./drivers/scsi/sd.c Thu May 24 22:48:12 2001
@@ -731,11 +731,19 @@
         * We need to retry the READ_CAPACITY because a UNIT_ATTENTION is
         * considered a fatal error, and many devices report such an error
         * just after a scsi bus reset.
-        */
-
+        */
        SRpnt = scsi_allocate_request(rscsi_disks[i].device);
 
+       if(SRpnt == NULL) {
+               return i;
+       }
+
        buffer = (unsigned char *) scsi_malloc(512);
+
+       if(buffer == NULL) {
+               scsi_release_request(SRpnt);
+               return i;
+       }
 
        spintime = 0;

Alan Cox wrote:

>> This patch fixes a couple of errors in the scsi driver code (sd.c).
>> 
>> --- ../linux/./drivers/scsi/sd.c     Sat Feb  3 11:45:55 2001
>> +++ ./drivers/scsi/sd.c      Mon May  7 22:09:58 2001
>> @@ -734,8 +734,15 @@
>>  */
>> 
>>  SRpnt = scsi_allocate_request(rscsi_disks[i].device);
>> +    if(SRpnt == NULL) {
>> +      return i;
>> +    }
>> 
>>  buffer = (unsigned char *) scsi_malloc(512);
>> +
>> +    if(buffer == NULL) {
>> +      return i;
> 
> You need to return the request surely
> 
>> 
> 
> -
> 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/
> 

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

\
 
 \ /
  Last update: 2005-03-22 12:53    [from the cache]
©2003-2008