openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ieee1394: sbp2: fix sbp2_remove_device for error cases 

Bug found by Olaf Hering <olh@suse.de>:
sbp2util_remove_command_orb_pool requires a valid lu->hi pointer.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2007-08-11 11:51:16 +02:00
parent d1caeb02b1
commit a2ee3f9bbb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/ieee1394/sbp2.c
View File

@ -513,9 +513,9 @@ static int sbp2util_create_command_orb_pool(struct sbp2_lu *lu)
return 0; return 0;
} }
static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu) static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu,
struct hpsb_host *host)
{ {
struct hpsb_host *host = lu->hi->host;
struct list_head *lh, *next; struct list_head *lh, *next;
struct sbp2_command_info *cmd; struct sbp2_command_info *cmd;
unsigned long flags; unsigned long flags;
@ -922,15 +922,16 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
if (!lu) if (!lu)
return; return;
hi = lu->hi; hi = lu->hi;
if (!hi)
goto no_hi;
if (lu->shost) { if (lu->shost) {
scsi_remove_host(lu->shost); scsi_remove_host(lu->shost);
scsi_host_put(lu->shost); scsi_host_put(lu->shost);
} }
flush_scheduled_work(); flush_scheduled_work();
sbp2util_remove_command_orb_pool(lu); sbp2util_remove_command_orb_pool(lu, hi->host);
list_del(&lu->lu_list); list_del(&lu->lu_list);
@ -971,9 +972,8 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
lu->ud->device.driver_data = NULL; lu->ud->device.driver_data = NULL;
if (hi) module_put(hi->host->driver->owner);
module_put(hi->host->driver->owner); no_hi:
kfree(lu); kfree(lu);
} }