2021-12-21 21:00:14

by Tom Rix

Subject: [PATCH] crypto: cleanup warning in qm_get_qos_value()

From: Tom Rix <[email protected]>

Building with clang static analysis returns this warning:

qm.c:4382:11: warning: The left operand of '==' is a garbage value
if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
~~~~ ^

The call to qm_qos_value_init() can return an error without setting
*val. So check ret before checking *val.

Signed-off-by: Tom Rix <[email protected]>
---
drivers/crypto/hisilicon/qm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index b1fe9c7b8cc89..c906f2e59277b 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -4379,7 +4379,7 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf,
return -EINVAL;

ret = qm_qos_value_init(val_buf, val);
- if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
+ if (ret || *val == 0 || *val > QM_QOS_MAX_VAL) {
pci_err(qm->pdev, "input qos value is error, please set 1~1000!\n");
return -EINVAL;
}
--
2.26.3

2021-12-21 21:31:22

by Nathan Chancellor

Subject: Re: [PATCH] crypto: cleanup warning in qm_get_qos_value()

On Tue, Dec 21, 2021 at 12:59:53PM -0800, [email protected] wrote:
> From: Tom Rix <[email protected]>
>
> Building with clang static analysis returns this warning:
>
> qm.c:4382:11: warning: The left operand of '==' is a garbage value
> if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
> ~~~~ ^
>
> The call to qm_qos_value_init() can return an error without setting
> *val. So check ret before checking *val.
>
> Signed-off-by: Tom Rix <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

Should this have a fixes tag?

Fixes: 72b010dc33b9 ("crypto: hisilicon/qm - supports writing QoS int the host")

> ---
> drivers/crypto/hisilicon/qm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
> index b1fe9c7b8cc89..c906f2e59277b 100644
> --- a/drivers/crypto/hisilicon/qm.c
> +++ b/drivers/crypto/hisilicon/qm.c
> @@ -4379,7 +4379,7 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf,
> return -EINVAL;
>
> ret = qm_qos_value_init(val_buf, val);
> - if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
> + if (ret || *val == 0 || *val > QM_QOS_MAX_VAL) {
> pci_err(qm->pdev, "input qos value is error, please set 1~1000!\n");
> return -EINVAL;
> }
> --
> 2.26.3
>

2021-12-22 01:44:58

by Zhou Wang

Subject: Re: [PATCH] crypto: cleanup warning in qm_get_qos_value()

在 2021/12/22 4:59, [email protected] 写道:
> From: Tom Rix <[email protected]>
>
> Building with clang static analysis returns this warning:
>
> qm.c:4382:11: warning: The left operand of '==' is a garbage value
> if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
> ~~~~ ^
>
> The call to qm_qos_value_init() can return an error without setting
> *val. So check ret before checking *val.
>
> Signed-off-by: Tom Rix <[email protected]>
> ---
> drivers/crypto/hisilicon/qm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
> index b1fe9c7b8cc89..c906f2e59277b 100644
> --- a/drivers/crypto/hisilicon/qm.c
> +++ b/drivers/crypto/hisilicon/qm.c
> @@ -4379,7 +4379,7 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf,
> return -EINVAL;
>
> ret = qm_qos_value_init(val_buf, val);
> - if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
> + if (ret || *val == 0 || *val > QM_QOS_MAX_VAL) {
> pci_err(qm->pdev, "input qos value is error, please set 1~1000!\n");
> return -EINVAL;
> }
>

Should check return firstly, thanks.

Zhou

2021-12-22 14:46:59

by Tom Rix

Subject: Re: [PATCH] crypto: cleanup warning in qm_get_qos_value()

On 12/21/21 1:31 PM, Nathan Chancellor wrote:
> On Tue, Dec 21, 2021 at 12:59:53PM -0800, [email protected] wrote:
>> From: Tom Rix <[email protected]>
>>
>> Building with clang static analysis returns this warning:
>>
>> qm.c:4382:11: warning: The left operand of '==' is a garbage value
>> if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
>> ~~~~ ^
>>
>> The call to qm_qos_value_init() can return an error without setting
>> *val. So check ret before checking *val.
>>
>> Signed-off-by: Tom Rix <[email protected]>
> Reviewed-by: Nathan Chancellor <[email protected]>
>
> Should this have a fixes tag?

I was debating that, the existing if-check will catch this, just not as
efficiently.

I'll add the line.

Tom

>
> Fixes: 72b010dc33b9 ("crypto: hisilicon/qm - supports writing QoS int the host")
>
>> ---
>> drivers/crypto/hisilicon/qm.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
>> index b1fe9c7b8cc89..c906f2e59277b 100644
>> --- a/drivers/crypto/hisilicon/qm.c
>> +++ b/drivers/crypto/hisilicon/qm.c
>> @@ -4379,7 +4379,7 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf,
>> return -EINVAL;
>>
>> ret = qm_qos_value_init(val_buf, val);
>> - if (*val == 0 || *val > QM_QOS_MAX_VAL || ret) {
>> + if (ret || *val == 0 || *val > QM_QOS_MAX_VAL) {
>> pci_err(qm->pdev, "input qos value is error, please set 1~1000!\n");
>> return -EINVAL;
>> }
>> --
>> 2.26.3
>>