| Message ID | 20191120135031.270708-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 0e7c353e1828819eb92af0a64fc9b2f4f778b76e |
| Headers | show |
| Series | [next] scsi: pm80xx: fix logic to break out of loop when register value is 2 or 3 | expand |
On Wed, Nov 20, 2019 at 2:50 PM Colin King <colin.king@canonical.com> wrote: > > From: Colin Ian King <colin.king@canonical.com> > > The condition (reg_val != 2) || (reg_val != 3) will always be true because > reg_val cannot be equal to two different values at the same time. Fix this > by replacing the || operator with && so that the loop will loop if reg_val > is not a 2 and not a 3 as was originally intended. > > Addresses-Coverity: ("Constant expression result") > Fixes: 50dc2f221455 ("scsi: pm80xx: Modified the logic to collect fatal dump") > Signed-off-by: Colin Ian King <colin.king@canonical.com> looks fine. thanks Colin. Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com> > --- > drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c > index 19601138e889..d41908b23760 100644 > --- a/drivers/scsi/pm8001/pm80xx_hwi.c > +++ b/drivers/scsi/pm8001/pm80xx_hwi.c > @@ -348,7 +348,7 @@ ssize_t pm80xx_get_fatal_dump(struct device *cdev, > do { > reg_val = pm8001_mr32(fatal_table_address, > MPI_FATAL_EDUMP_TABLE_STATUS); > - } while (((reg_val != 2) || (reg_val != 3)) && > + } while (((reg_val != 2) && (reg_val != 3)) && > time_before(jiffies, start)); > > if (reg_val < 2) { > -- > 2.24.0 >
Colin, > The condition (reg_val != 2) || (reg_val != 3) will always be true > because reg_val cannot be equal to two different values at the same > time. Fix this by replacing the || operator with && so that the loop > will loop if reg_val is not a 2 and not a 3 as was originally > intended. Applied to 5.5/scsi-queue, thanks!
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 19601138e889..d41908b23760 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -348,7 +348,7 @@ ssize_t pm80xx_get_fatal_dump(struct device *cdev, do { reg_val = pm8001_mr32(fatal_table_address, MPI_FATAL_EDUMP_TABLE_STATUS); - } while (((reg_val != 2) || (reg_val != 3)) && + } while (((reg_val != 2) && (reg_val != 3)) && time_before(jiffies, start)); if (reg_val < 2) {