Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 298d8015 authored by Wei Yongjun's avatar Wei Yongjun Committed by Jens Axboe
Browse files

mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function() 

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7c5d6238

drivers/block/mtip32xx/mtip32xx.c

+2 −1
Original line number Diff line number Diff line
@@ -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++) {

		/*