| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20200811151505.12222-1-trix@redhat.com>
Date: Tue, 11 Aug 2020 08:15:05 -0700
From: trix@...hat.com
To: stern@...land.harvard.edu, gregkh@...uxfoundation.org,
acozzette@...hmc.edu
Cc: linux-usb@...r.kernel.org, usb-storage@...ts.one-eyed-alien.net,
linux-kernel@...r.kernel.org, Tom Rix <trix@...hat.com>
Subject: [PATCH] USB: realtek_cr: fix return check for dma functions
From: Tom Rix <trix@...hat.com>
clang static analysis reports this representative problem
realtek_cr.c:639:3: warning: The left expression of the compound
assignment is an uninitialized value. The computed value will
also be garbage
SET_BIT(value, 2);
^~~~~~~~~~~~~~~~~
value is set by a successful call to rts51x_read_mem()
retval = rts51x_read_mem(us, 0xFE77, &value, 1);
if (retval < 0)
return -EIO;
A successful call to rts51x_read_mem returns 0, failure can
return positive and negative values. This check is wrong
for a number of functions. Fix the retval check.
Fixes: 065e60964e29 ("ums_realtek: do not use stack memory for DMA")
Signed-off-by: Tom Rix <trix@...hat.com>
---
drivers/usb/storage/realtek_cr.c | 36 ++++++++++++++++----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 3789698d9d3c..b983753e2368 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -481,16 +481,16 @@ static int enable_oscillator(struct us_data *us)
u8 value;
retval = rts51x_read_mem(us, 0xFE77, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
value |= 0x04;
retval = rts51x_write_mem(us, 0xFE77, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
retval = rts51x_read_mem(us, 0xFE77, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
if (!(value & 0x04))
@@ -533,7 +533,7 @@ static int do_config_autodelink(struct us_data *us, int enable, int force)
u8 value;
retval = rts51x_read_mem(us, 0xFE47, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
if (enable) {
@@ -549,7 +549,7 @@ static int do_config_autodelink(struct us_data *us, int enable, int force)
/* retval = rts51x_write_mem(us, 0xFE47, &value, 1); */
retval = __do_config_autodelink(us, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
return 0;
@@ -565,7 +565,7 @@ static int config_autodelink_after_power_on(struct us_data *us)
return 0;
retval = rts51x_read_mem(us, 0xFE47, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
if (auto_delink_en) {
@@ -580,7 +580,7 @@ static int config_autodelink_after_power_on(struct us_data *us)
/* retval = rts51x_write_mem(us, 0xFE47, &value, 1); */
retval = __do_config_autodelink(us, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
retval = enable_oscillator(us);
@@ -602,18 +602,18 @@ static int config_autodelink_after_power_on(struct us_data *us)
/* retval = rts51x_write_mem(us, 0xFE47, &value, 1); */
retval = __do_config_autodelink(us, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
if (CHECK_ID(chip, 0x0159, 0x5888)) {
value = 0xFF;
retval = rts51x_write_mem(us, 0xFE79, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
value = 0x01;
retval = rts51x_write_mem(us, 0x48, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
}
}
@@ -633,37 +633,37 @@ static int config_autodelink_before_power_down(struct us_data *us)
if (auto_delink_en) {
retval = rts51x_read_mem(us, 0xFE77, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
SET_BIT(value, 2);
retval = rts51x_write_mem(us, 0xFE77, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
if (CHECK_ID(chip, 0x0159, 0x5888)) {
value = 0x01;
retval = rts51x_write_mem(us, 0x48, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
}
retval = rts51x_read_mem(us, 0xFE47, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
SET_BIT(value, 0);
if (CHECK_ID(chip, 0x0138, 0x3882))
SET_BIT(value, 2);
retval = rts51x_write_mem(us, 0xFE77, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
} else {
if (CHECK_ID(chip, 0x0159, 0x5889) ||
CHECK_ID(chip, 0x0138, 0x3880) ||
CHECK_ID(chip, 0x0138, 0x3882)) {
retval = rts51x_read_mem(us, 0xFE47, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
if (CHECK_ID(chip, 0x0159, 0x5889) ||
@@ -677,14 +677,14 @@ static int config_autodelink_before_power_down(struct us_data *us)
/* retval = rts51x_write_mem(us, 0xFE47, &value, 1); */
retval = __do_config_autodelink(us, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
}
if (CHECK_ID(chip, 0x0159, 0x5888)) {
value = 0x01;
retval = rts51x_write_mem(us, 0x48, &value, 1);
- if (retval < 0)
+ if (retval != STATUS_SUCCESS)
return -EIO;
}
}
--
2.18.1
Powered by blists - more mailing lists