Skip to contentSkip to conversation

scsi: lpfc: Fix a condition in lpfc_dmp_dbg()

PATCH Superseded Dan Carpenter 2 participants 4 messages Jul 9, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: lpfc: Fix a condition in lpfc_dmp_dbg()

These variables are unsigned so the result of the subtraction is also unsigned and thus can't be negative. Change it to a comparison and remove the subtraction.

Fixes 372c187b8a70 ("scsi: lpfc: Add an internal trace log buffer")
---
 drivers/scsi/lpfc/lpfc_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_init.c +1 -1
index 7285b0114837..2bb2c96e7784 100644
@@ -14152,7 +14152,7 @@ void lpfc_dmp_dbg(struct lpfc_hba *phba)
 		if ((start_idx + dbg_cnt) > (DBG_LOG_SZ - 1)) {
 			temp_idx = (start_idx + dbg_cnt) % DBG_LOG_SZ;
 		} else {
-			if ((start_idx - dbg_cnt) < 0) {
+			if (start_idx > dbg_cnt) {
 				start_idx = DBG_LOG_SZ - (dbg_cnt - start_idx);
 				temp_idx = 0;
 			} else {
Signature · 1 line
2.27.0
#1 lore raw
Quoted 15 lines · Dan Carpenter

These variables are unsigned so the result of the subtraction is also unsigned and thus can't be negative. Change it to a comparison and remove the subtraction.

Fixes 372c187b8a70 ("scsi: lpfc: Add an internal trace log buffer")
---
 drivers/scsi/lpfc/lpfc_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_init.c +0 -0
index 7285b0114837..2bb2c96e7784 100644

drivers/scsi/lpfc/lpfc_init.c void lpfc_dmp_dbg(struct lpfc_hba *phba) · line 14155

Quoted 5 lines
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -14152,7 +14152,7 @@ void lpfc_dmp_dbg(struct lpfc_hba *phba)
 		if ((start_idx + dbg_cnt) > (DBG_LOG_SZ - 1)) {
 			temp_idx = (start_idx + dbg_cnt) % DBG_LOG_SZ;
 		} else {
-			if ((start_idx - dbg_cnt) < 0) {
+			if (start_idx > dbg_cnt) {

Nope. That's reversed. I'm dumb. Let me resend.

regards,
dan carpenter

#2 lore raw

PATCH v2 1/1 scsi: lpfc: Fix a condition in lpfc_dmp_dbg()

These variables are unsigned so the result of the subtraction is also unsigned and thus can't be negative. Change it to a comparison and remove the subtraction.

Fixes 372c187b8a70 ("scsi: lpfc: Add an internal trace log buffer")

---
v2: I reverse the if statement in v1

 drivers/scsi/lpfc/lpfc_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_init.c +1 -1
index 7285b0114837..2bb2c96e7784 100644
@@ -14152,7 +14152,7 @@ void lpfc_dmp_dbg(struct lpfc_hba *phba)
 		if ((start_idx + dbg_cnt) > (DBG_LOG_SZ - 1)) {
 			temp_idx = (start_idx + dbg_cnt) % DBG_LOG_SZ;
 		} else {
-			if ((start_idx - dbg_cnt) < 0) {
+			if (start_idx < dbg_cnt) {
 				start_idx = DBG_LOG_SZ - (dbg_cnt - start_idx);
 				temp_idx = 0;
 			} else {
Signature · 1 line
2.27.0
#3 lore raw
Quoted 17 lines · Dan Carpenter

These variables are unsigned so the result of the subtraction is also unsigned and thus can't be negative. Change it to a comparison and remove the subtraction.

Fixes 372c187b8a70 ("scsi: lpfc: Add an internal trace log buffer")

---
v2: I reverse the if statement in v1

  drivers/scsi/lpfc/lpfc_init.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_init.c +0 -0
index 7285b0114837..2bb2c96e7784 100644

drivers/scsi/lpfc/lpfc_init.c void lpfc_dmp_dbg(struct lpfc_hba *phba) · line 14158

Quoted 8 lines
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -14152,7 +14152,7 @@ void lpfc_dmp_dbg(struct lpfc_hba *phba)
  		if ((start_idx + dbg_cnt) > (DBG_LOG_SZ - 1)) {
  			temp_idx = (start_idx + dbg_cnt) % DBG_LOG_SZ;
  		} else {
-			if ((start_idx - dbg_cnt) < 0) {
+			if (start_idx < dbg_cnt) {
  				start_idx = DBG_LOG_SZ - (dbg_cnt - start_idx);
  				temp_idx = 0;
  			} else {

Already resolved/accepted.

https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git/commit/?idwdd7d7b3442

Thank you though.

-- james