| Message ID | YIE9hEhXpdfffKg1@mwanda |
|---|---|
| State | New |
| Headers | show |
| Series | [net] bnxt_en: fix ternary sign extension bug in bnxt_show_temp() | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 22 Apr 2021 12:10:28 +0300 you wrote: > The problem is that bnxt_show_temp() returns long but "rc" is an int > and "len" is a u32. With ternary operations the type promotion is quite > tricky. The negative "rc" is first promoted to u32 and then to long so > it ends up being a high positive value instead of a a negative as we > intended. > > Fix this by removing the ternary. > > [...] Here is the summary with links: - [net] bnxt_en: fix ternary sign extension bug in bnxt_show_temp() https://git.kernel.org/netdev/net/c/27537929f30d You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index e15d454e33f0..f582d51e25ed 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -9736,7 +9736,9 @@ static ssize_t bnxt_show_temp(struct device *dev, if (!rc) len = sprintf(buf, "%u\n", resp->temp * 1000); /* display millidegree */ mutex_unlock(&bp->hwrm_cmd_lock); - return rc ?: len; + if (rc) + return rc; + return len; } static SENSOR_DEVICE_ATTR(temp1_input, 0444, bnxt_show_temp, NULL, 0);
The problem is that bnxt_show_temp() returns long but "rc" is an int and "len" is a u32. With ternary operations the type promotion is quite tricky. The negative "rc" is first promoted to u32 and then to long so it ends up being a high positive value instead of a a negative as we intended. Fix this by removing the ternary. Fixes: d69753fa1ecb ("bnxt_en: return proper error codes in bnxt_show_temp") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)