]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Thu, 8 Nov 2012 09:35:38 +0000 (17:35 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 23 Nov 2012 13:32:55 +0000 (14:32 +0100)
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>
drivers/block/mtip32xx/mtip32xx.c

index faa5591b579f9e01d946c367cc07dba6dbe5fdbe..9694dd99bbbc7253af1c3626823899f985b1afc2 100644 (file)
@@ -559,7 +559,7 @@ static void mtip_timeout_function(unsigned long int data)
        struct mtip_cmd *command;
        int tag, cmdto_cnt = 0;
        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];
 
        if (unlikely(!port))
@@ -572,6 +572,7 @@ static void mtip_timeout_function(unsigned long int data)
        }
        /* clear the tag accumulator */
        memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));
+       num_command_slots = port->dd->slot_groups * 32;
 
        for (tag = 0; tag < num_command_slots; tag++) {
                /*