* [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats()
@ 2021-06-09 9:52 Dan Carpenter
2021-06-09 9:53 ` [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee() Dan Carpenter
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Dan Carpenter @ 2021-06-09 9:52 UTC (permalink / raw)
To: Andrew Lunn, Yang Yingliang
Cc: Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S. Miller, Jakub Kicinski, netdev, kernel-janitors
The "hi" variable is a u64 but the qca8k_read() writes to the top 32
bits of it. That will work on little endian systems but it's a bit
subtle. It's cleaner to make declare "hi" as a u32. We will still need
to cast it when we shift it later on in the function but that's fine.
Fixes: 7c9896e37807 ("net: dsa: qca8k: check return value of read functions correctly")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/dsa/qca8k.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 6fe963ba23e8..9df3514d1ff2 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1412,7 +1412,7 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
const struct qca8k_mib_desc *mib;
u32 reg, i, val;
- u64 hi = 0;
+ u32 hi = 0;
int ret;
for (i = 0; i < ARRAY_SIZE(ar8327_mib); i++) {
@@ -1424,14 +1424,14 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
continue;
if (mib->size == 2) {
- ret = qca8k_read(priv, reg + 4, (u32 *)&hi);
+ ret = qca8k_read(priv, reg + 4, &hi);
if (ret < 0)
continue;
}
data[i] = val;
if (mib->size == 2)
- data[i] |= hi << 32;
+ data[i] |= (u64)hi << 32;
}
}
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee()
2021-06-09 9:52 [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Dan Carpenter
@ 2021-06-09 9:53 ` Dan Carpenter
2021-06-09 13:48 ` Vladimir Oltean
2021-06-09 13:44 ` [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Vladimir Oltean
2021-06-09 21:20 ` patchwork-bot+netdevbpf
2 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2021-06-09 9:53 UTC (permalink / raw)
To: Andrew Lunn, Yang Yingliang
Cc: Vivien Didelot, Florian Fainelli, Vladimir Oltean,
David S. Miller, Jakub Kicinski, netdev, kernel-janitors
This code check "reg" but "ret" was intended so the error handling will
never trigger.
Fixes: 7c9896e37807 ("net: dsa: qca8k: check return value of read functions correctly")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/dsa/qca8k.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 9df3514d1ff2..1f63f50f73f1 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1454,10 +1454,8 @@ qca8k_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee)
mutex_lock(&priv->reg_mutex);
ret = qca8k_read(priv, QCA8K_REG_EEE_CTRL, ®);
- if (reg < 0) {
- ret = reg;
+ if (ret < 0)
goto exit;
- }
if (eee->eee_enabled)
reg |= lpi_en;
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats()
2021-06-09 9:52 [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Dan Carpenter
2021-06-09 9:53 ` [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee() Dan Carpenter
@ 2021-06-09 13:44 ` Vladimir Oltean
2021-06-09 21:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: Vladimir Oltean @ 2021-06-09 13:44 UTC (permalink / raw)
To: Dan Carpenter
Cc: Andrew Lunn, Yang Yingliang, Vivien Didelot, Florian Fainelli,
David S. Miller, Jakub Kicinski, netdev, kernel-janitors
On Wed, Jun 09, 2021 at 12:52:12PM +0300, Dan Carpenter wrote:
> The "hi" variable is a u64 but the qca8k_read() writes to the top 32
> bits of it. That will work on little endian systems but it's a bit
> subtle. It's cleaner to make declare "hi" as a u32. We will still need
> to cast it when we shift it later on in the function but that's fine.
>
> Fixes: 7c9896e37807 ("net: dsa: qca8k: check return value of read functions correctly")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee()
2021-06-09 9:53 ` [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee() Dan Carpenter
@ 2021-06-09 13:48 ` Vladimir Oltean
0 siblings, 0 replies; 5+ messages in thread
From: Vladimir Oltean @ 2021-06-09 13:48 UTC (permalink / raw)
To: Dan Carpenter
Cc: Andrew Lunn, Yang Yingliang, Vivien Didelot, Florian Fainelli,
David S. Miller, Jakub Kicinski, netdev, kernel-janitors
On Wed, Jun 09, 2021 at 12:53:03PM +0300, Dan Carpenter wrote:
> This code check "reg" but "ret" was intended so the error handling will
> never trigger.
>
> Fixes: 7c9896e37807 ("net: dsa: qca8k: check return value of read functions correctly")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats()
2021-06-09 9:52 [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Dan Carpenter
2021-06-09 9:53 ` [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee() Dan Carpenter
2021-06-09 13:44 ` [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Vladimir Oltean
@ 2021-06-09 21:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-09 21:20 UTC (permalink / raw)
To: Dan Carpenter
Cc: andrew, yangyingliang, vivien.didelot, f.fainelli, olteanv,
davem, kuba, netdev, kernel-janitors
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Wed, 9 Jun 2021 12:52:12 +0300 you wrote:
> The "hi" variable is a u64 but the qca8k_read() writes to the top 32
> bits of it. That will work on little endian systems but it's a bit
> subtle. It's cleaner to make declare "hi" as a u32. We will still need
> to cast it when we shift it later on in the function but that's fine.
>
> Fixes: 7c9896e37807 ("net: dsa: qca8k: check return value of read functions correctly")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> [...]
Here is the summary with links:
- [1/2,net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats()
https://git.kernel.org/netdev/net-next/c/aa3d020b22cb
- [2/2,net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee()
https://git.kernel.org/netdev/net-next/c/3d0167f2a627
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-09 21:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-09 9:52 [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Dan Carpenter
2021-06-09 9:53 ` [PATCH 2/2 net-next] net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee() Dan Carpenter
2021-06-09 13:48 ` Vladimir Oltean
2021-06-09 13:44 ` [PATCH 1/2 net-next] net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() Vladimir Oltean
2021-06-09 21:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).