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

Commit c8a57c3c authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

net/qla3xxx: Fix a test in ql_reset_work() 



[ Upstream commit 5361448e45fac6fb96738df748229432a62d78b6 ]

test_bit() tests if one bit is set or not.
Here the logic seems to check of bit QL_RESET_PER_SCSI (i.e. 4) OR bit
QL_RESET_START (i.e. 3) is set.

In fact, it checks if bit 7 (4 | 3 = 7) is set, that is to say
QL_ADAPTER_UP.

This looks harmless, because this bit is likely be set, and when the
ql_reset_work() delayed work is scheduled in ql3xxx_isr() (the only place
that schedule this work), QL_RESET_START or QL_RESET_PER_SCSI is set.

This has been spotted by smatch.

Fixes: 5a4faa87 ("[PATCH] qla3xxx NIC driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/80e73e33f390001d9c0140ffa9baddf6466a41a2.1652637337.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3edaea42

drivers/net/ethernet/qlogic/qla3xxx.c

+2 −1
Original line number Diff line number Diff line
@@ -3630,7 +3630,8 @@ static void ql_reset_work(struct work_struct *work) 
		qdev->mem_map_registers;

	unsigned long hw_flags;



	if (test_bit((QL_RESET_PER_SCSI | QL_RESET_START), &qdev->flags)) {

	if (test_bit(QL_RESET_PER_SCSI, &qdev->flags) ||

	    test_bit(QL_RESET_START, &qdev->flags)) {

		clear_bit(QL_LINK_MASTER, &qdev->flags);



		/*