summaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa/hirschmann
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-11-09 13:40:08 +0100
committerJakub Kicinski <kuba@kernel.org>2020-11-11 02:46:20 +0100
commit2776d2320ac186988273a9b312073317b6c50c76 (patch)
tree84e452df666cbe3e337d2ecb913c2aa3267a6b65 /drivers/net/dsa/hirschmann
parentnet: sched: fix misspellings using misspell-fixer tool (diff)
downloadlinux-2776d2320ac186988273a9b312073317b6c50c76.tar.xz
linux-2776d2320ac186988273a9b312073317b6c50c76.zip
net: dsa: fix unintended sign extension on a u16 left shift
The left shift of u16 variable high is promoted to the type int and then sign extended to a 64 bit u64 value. If the top bit of high is set then the upper 32 bits of the result end up being set by the sign extension. Fix this by explicitly casting the value in high to a u64 before left shifting by 16 places. Also, remove the initialisation of variable value to 0 at the start of each loop iteration as the value is never read and hence the assignment it is redundant. Addresses-Coverity: ("Unintended sign extension") Fixes: e4b27ebc780f ("net: dsa: Add DSA driver for Hirschmann Hellcreek switches") Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de> Link: https://lore.kernel.org/r/20201109124008.2079873-1-colin.king@canonical.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/dsa/hirschmann')
-rw-r--r--drivers/net/dsa/hirschmann/hellcreek.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c
index dfa66f7260d6..d42f40c76ba5 100644
--- a/drivers/net/dsa/hirschmann/hellcreek.c
+++ b/drivers/net/dsa/hirschmann/hellcreek.c
@@ -308,7 +308,7 @@ static void hellcreek_get_ethtool_stats(struct dsa_switch *ds, int port,
const struct hellcreek_counter *counter = &hellcreek_counter[i];
u8 offset = counter->offset + port * 64;
u16 high, low;
- u64 value = 0;
+ u64 value;
mutex_lock(&hellcreek->reg_lock);
@@ -320,7 +320,7 @@ static void hellcreek_get_ethtool_stats(struct dsa_switch *ds, int port,
*/
high = hellcreek_read(hellcreek, HR_CRDH);
low = hellcreek_read(hellcreek, HR_CRDL);
- value = (high << 16) | low;
+ value = ((u64)high << 16) | low;
hellcreek_port->counter_values[i] += value;
data[i] = hellcreek_port->counter_values[i];