Skip to contentSkip to conversation

net: pcs: xpcs: fix error handling on failed to allocate memory

PATCH Applied Wong Vee Khee 3 participants 3 messages Aug 10, 2021 – Aug 11, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: pcs: xpcs: fix error handling on failed to allocate memory

Drivers such as sja1105 and stmmac that call xpcs_create() expects an error returned by the pcs-xpcs module, but this was not the case on failed to allocate memory.

Fixed this by returning an -ENOMEM instead of a NULL pointer.

Cc Vladimir Oltean <[email protected]>
---
 drivers/net/pcs/pcs-xpcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/pcs/pcs-xpcs.c +1 -1
index 63fda3fc40aa..4bd61339823c 100644
@@ -1089,7 +1089,7 @@ struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,
 
 	xpcs = kzalloc(sizeof(*xpcs), GFP_KERNEL);
 	if (!xpcs)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	xpcs->mdiodev = mdiodev;
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 28 lines · Wong Vee Khee

Drivers such as sja1105 and stmmac that call xpcs_create() expects an error returned by the pcs-xpcs module, but this was not the case on failed to allocate memory.

Fixed this by returning an -ENOMEM instead of a NULL pointer.

Cc Vladimir Oltean <[email protected]>
---
 drivers/net/pcs/pcs-xpcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/pcs/pcs-xpcs.c +1 -1
index 63fda3fc40aa..4bd61339823c 100644
@@ -1089,7 +1089,7 @@ struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,
 
 	xpcs = kzalloc(sizeof(*xpcs), GFP_KERNEL);
 	if (!xpcs)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	xpcs->mdiodev = mdiodev;
 
Signature · 1 line
2.25.1

I know I changed my mind, but seeing that Intel's Alder Lake S patches are likely going to stall for a while due to ungoing design discussions:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
the net -> net-next merge might not be so far in the future after all.

So could this patch be applied to the "net" tree after all? According to the cadence of the last 2 net -> net-next merges, which were on Jul 31 and Aug 5, the next one should be soon-ish.

The patch is fine:

Fixes 3ad1d171548e ("net: dsa: sja1105: migrate to xpcs for SGMII")
#2 lore raw
In reply to Wong Vee Khee
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 10 lines · On Tue, 10 Aug 2021 16:58:12 +0800 you wrote:

Drivers such as sja1105 and stmmac that call xpcs_create() expects an error returned by the pcs-xpcs module, but this was not the case on failed to allocate memory.

Fixed this by returning an -ENOMEM instead of a NULL pointer.

Cc Vladimir Oltean <[email protected]>

[...]

Here is the summary with links:
- [net-next,1/1] net: pcs: xpcs: fix error handling on failed to allocate memory

    https://git.kernel.org/netdev/net/c/2cad5d2ed1b4

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html