lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function()

Browse Source 
The dereference to port should be moved below the NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Wei Yongjun
2012-11-08 17:35:38 +08:00
committed by Jens Axboe
parent 7c5d62388e
commit 298d80152c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/mtip32xx/mtip32xx.c
View File

@@ -559,7 +559,7 @@ static void mtip_timeout_function(unsigned long int data)
struct mtip_cmd *command; struct mtip_cmd *command;
int tag, cmdto_cnt = 0; int tag, cmdto_cnt = 0;
unsigned int bit, group; unsigned int bit, group;
unsigned int num_command_slots = port->dd->slot_groups * 32; unsigned int num_command_slots;
unsigned long to, tagaccum[SLOTBITS_IN_LONGS]; unsigned long to, tagaccum[SLOTBITS_IN_LONGS];
if (unlikely(!port)) if (unlikely(!port))
@@ -572,6 +572,7 @@ static void mtip_timeout_function(unsigned long int data)
} }
/* clear the tag accumulator */ /* clear the tag accumulator */
memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long)); memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));
num_command_slots = port->dd->slot_groups * 32;
for (tag = 0; tag < num_command_slots; tag++) { for (tag = 0; tag < num_command_slots; tag++) {
/* /*