| From 7117770c8b96c02c95438e013a1ffae45cf2fa83 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 15 May 2022 20:07:02 +0200 |
| Subject: net/qla3xxx: Fix a test in ql_reset_work() |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ 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: 5a4faa873782 ("[PATCH] qla3xxx NIC driver") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Link: https://lore.kernel.org/r/80e73e33f390001d9c0140ffa9baddf6466a41a2.1652637337.git.christophe.jaillet@wanadoo.fr |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/qlogic/qla3xxx.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c |
| index 147effc16316..e62e3a9d5249 100644 |
| --- a/drivers/net/ethernet/qlogic/qla3xxx.c |
| +++ b/drivers/net/ethernet/qlogic/qla3xxx.c |
| @@ -3625,7 +3625,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); |
| |
| /* |
| -- |
| 2.35.1 |
| |
