i4l:add some checks for valid drvid and driver pointer
PATCH 1/1 i4l:add some checks for valid drvid and driver pointer
If all drivers go away before all ISDN network interfaces are closed we got a OOps on removing interfaces, this patch avoid it.
Signed-off-by Karsten Keil <[email protected]>
---
drivers/isdn/i4l/isdn_common.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
9e5d3a74fd93148042d434d61699395190c895da
drivers/isdn/i4l/isdn_common.c +9 -2
@@ -338,8 +338,12 @@ isdn_command(isdn_ctrl *cmd) {if (cmd->driver ==-1 ) {printk (KERN_WARNING "isdn_command command(%x) driver -1\n" , cmd->command); -return (1 ); +return 1 ; } +if (!dev->drv[cmd->driver]) +return 1 ; +if (!dev->drv[cmd->driver]->interface) +return 1 ;if (cmd->command ==ISDN_CMD_SETL2 ) {int idx =isdn_dc2minor (cmd->driver, cmd->arg &255 );unsigned long l2prot = (cmd->arg >>8 ) &255 ;
@@ -1903,6 +1907,8 @@ isdn_free_channel(int di, int ch, int us {int i; +if ((di <0 ) || (ch <0 )) +return ;for (i =0 ; i <ISDN_MAX_CHANNELS ; i++) if (((!usage) || ((dev->usage[i] & ISDN_USAGE_MASK) == usage)) && (dev->drvmap[i] == di) &&
@@ -1918,7 +1924,8 @@ isdn_free_channel(int di, int ch, int us dev->v110[i] =NULL ;// 20.10.99 JIM, try to reinitialize v110 ! isdn_info_update (); -skb_queue_purge (&dev->drv[di]->rpqueue[ch]); +if (dev->drv[di]) +skb_queue_purge (&dev->drv[di]->rpqueue[ch]); } }
Signature · 3 lines
Karsten Keil SuSE Labs ISDN development