Fix bug: accessing past end of array.
Subsystems (2)
PATCH 1/1 Fix bug: accessing past end of array.
If the card is re-inserted 2 or more times, we access elements past the end of the aha152x_host array.
Also correct spelling errors.
This is for 2.6.17.
Signed-off-by Alex Davis <alex14641 at yahoo dot com>
=========================================================================
drivers/scsi/aha152x.c +0 -1
@@ -766,7 +766,7 @@struct Scsi_Host *shpnt =lookup_irq (irqno);if (!shpnt) { - printk(KERN_ERR "aha152x: catched software interrupt %d for unknown controller.\n",
irqno);
+ printk(KERN_ERR "aha152x: caught software interrupt %d for unknown controller.\n",
irqno);
return IRQ_NONE;
}
@@ -779,6 +779,7 @@
struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup) {
struct Scsi_Host *shpnt;
+ int i;
shpnt = scsi_host_alloc(&aha152x_driver_template, sizeof(struct aha152x_hostdata)); if (!shpnt) {
@@ -787,6 +788,22 @@
}
/* need to have host registered before triggering any interrupt */
+
+ /* find an empty slot. */
+ for ( i = 0; i < ARRAY_SIZE(aha152x_host); ++i ) {
+ if ( aha152x_host[i] == NULL ) {
+ break;
+ }
+ }
+
+ /* no empty slots? */
+ if ( i >= ARRAY_SIZE(aha152x_host) ) {
+ printk(KERN_ERR "aha152x: too many hosts: %d\n", i + 1);
+ return NULL;
+ }
+
+ registered_count = i;
+
aha152x_host[registered_count] = shpnt;
memset(HOSTDATA(shpnt), 0, sizeof *HOSTDATA(shpnt));
@@ -915,6 +932,8 @@
void aha152x_release(struct Scsi_Host *shpnt)
{
+ int i;
+
if(!shpnt)
return;
@@ -933,6 +952,12 @@
scsi_remove_host(shpnt);
scsi_host_put(shpnt);
+ for ( i = 0; i < ARRAY_SIZE(aha152x_host); ++i ) {
+ if ( aha152x_host[i] == shpnt ) {
+ aha152x_host[i] = NULL;
+ break;
+ }
+ }
}
@@ -1458,7 +1483,7 @@
unsigned char rev, dmacntrl0;
if (!shpnt) {
- printk(KERN_ERR "aha152x: catched interrupt %d for unknown controller.\n", irqno);
+ printk(KERN_ERR "aha152x: caught interrupt %d for unknown controller.\n", irqno);
return IRQ_NONE;
}
@@ -2976,6 +3001,9 @@
Scsi_Cmnd *ptr;
unsigned long flags;
+ if(!shpnt)
+ return;
+
DO_LOCK(flags);
printk(KERN_DEBUG "\nqueue status:\nissue_SC:\n"); for (ptr = ISSUE_SC; ptr; ptr = SCNEXT(ptr))
@@ -3941,7 +3969,6 @@
for(i=0; i<ARRAY_SIZE(setup); i++) {
aha152x_release(aha152x_host[i]);
- aha152x_host[i]=NULL;
}
}
I code, therefore I am
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
[adding linux-scsi]
Quoted 2 lines · On Sun, 25 Jun 2006 19:06:46 -0700 (PDT) Alex Davis wrote:
If the card is re-inserted 2 or more times, we access elements past the end of the
aha152x_hostarray.
When I was testing/reproducing this, I observed that removing the card did not cause the aha152x_detach() function to be called (in drivers/scsi/pcmcia/aha152x_stub.c). However, I didn't find out why that doesn't happen. I think fixing this would be a big help.
Quoted 93 lines
Also correct spelling errors.
This is for 2.6.17.
Signed-off-by Alex Davis <alex14641 at yahoo dot com>
=========================================================================
diff -ulinux-2.6.17.1-orig/drivers/scsi/aha152x.clinux-2.6.17.1/drivers/scsi/aha152x.cdrivers/scsi/aha152x.c +1
-1@@ -766,7 +766,7 @@struct Scsi_Host *shpnt =lookup_irq (irqno);if (!shpnt) { -printk (KERN_ERR "aha152x: catched software interrupt %d for unknown controller.\n" , irqno); +printk (KERN_ERR "aha152x: caught software interrupt %d for unknown controller.\n" , irqno);return IRQ_NONE ;drivers/scsi/aha152x.c +29
-1}@@ -779,6 +779,7 @@struct Scsi_Host *aha152x_probe_one (struct aha152x_setup *setup) {struct Scsi_Host *shpnt; +int i; shpnt =scsi_host_alloc (&aha152x_driver_template,sizeof (struct aha152x_hostdata ));if (!shpnt) {@@ -787,6 +788,22 @@ }/* need to have host registered before triggering any interrupt */ + +/* find an empty slot. */ +for ( i =0 ; i <ARRAY_SIZE (aha152x_host); ++i ) { +if ( aha152x_host[i] ==NULL ) { +break ; + } + } + +/* no empty slots? */ +if ( i >=ARRAY_SIZE (aha152x_host) ) { +printk (KERN_ERR "aha152x: too many hosts: %d\n" , i +1 ); +return NULL ; + } + + registered_count = i; + aha152x_host[registered_count] = shpnt;memset (HOSTDATA (shpnt),0 ,sizeof *HOSTDATA (shpnt));@@ -915,6 +932,8 @@void aha152x_release (struct Scsi_Host *shpnt) { +int i; +if (!shpnt)return ;@@ -933,6 +952,12 @@scsi_remove_host (shpnt);scsi_host_put (shpnt); +for ( i =0 ; i <ARRAY_SIZE (aha152x_host); ++i ) { +if ( aha152x_host[i] == shpnt ) { + aha152x_host[i] =NULL ; +break ; + } + } }@@ -1458,7 +1483,7 @@unsigned char rev, dmacntrl0;if (!shpnt) { -printk (KERN_ERR "aha152x: catched interrupt %d for unknown controller.\n" , irqno); +printk (KERN_ERR "aha152x: caught interrupt %d for unknown controller.\n" , irqno);return IRQ_NONE ; }@@ -2976,6 +3001,9 @@Scsi_Cmnd *ptr;unsigned long flags; +if (!shpnt) +return ; +DO_LOCK (flags);printk (KERN_DEBUG "\nqueue status:\nissue_SC:\n" );for (ptr =ISSUE_SC ; ptr; ptr =SCNEXT (ptr))
drivers/scsi/aha152x.c line 3974
Quoted 7 lines
drivers/scsi/aha152x.c +0
-1@@ -3941,7 +3969,6 @@for (i=0 ; i<ARRAY_SIZE (setup); i++) {aha152x_release (aha152x_host[i]); - aha152x_host[i]=NULL ; } }
---
~Randy
Quoted 4 lines · --- "Randy.Dunlap
[adding linux-scsi]
On Sun, 25 Jun 2006 19:06:46 -0700 (PDT) Alex Davis wrote:
Quoted 9 lines
Quoted 2 lines
If the card is re-inserted 2 or more times, we access elements past the end of the
aha152x_hostarray.When I was testing/reproducing this, I observed that removing the card did not cause the
aha152x_detach()function to be called (indrivers/scsi/pcmcia/aha152x_stub.c). However, I didn't find out why that doesn't happen. I think fixing this would be a big help.
Strange. I'm not having that problem. I even added a printk to verify. I get the following in my logs:
[4295091.671000] pccard: card ejected from slot 0 [4295091.671000] aha152x_detach(0xd8877600) <-----added printk.
Quoted 7 lines
Quoted 7 lines
Also correct spelling errors.
This is for 2.6.17.
Signed-off-by Alex Davis <alex14641 at yahoo dot com>
=========================================================================
diff -ulinux-2.6.17.1-orig/drivers/scsi/aha152x.clinux-2.6.17.1/drivers/scsi/aha152x.c
[snip]
I code, therefore I am
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com