[PATCH net-next 1/1] net: pcs: xpcs: fix error handling on failed to allocate memory

Subsystems: ethernet phy library, networking drivers, synopsys designware ethernet xpcs driver, the rest

STALE1820d LANDED

Landed in mainline as 2cad5d2ed1b4 on 2021-08-11.

3 messages, 3 authors, 2021-08-11 · open the first message on its own page

[PATCH net-next 1/1] net: pcs: xpcs: fix error handling on failed to allocate memory

From: Wong Vee Khee <hidden>
Date: 2021-08-10 08:53:00

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 <vladimir.oltean@nxp.com>
Signed-off-by: Wong Vee Khee <redacted>
---
 drivers/net/pcs/pcs-xpcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 63fda3fc40aa..4bd61339823c 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -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;
 
-- 
2.25.1

Re: [PATCH net-next 1/1] net: pcs: xpcs: fix error handling on failed to allocate memory

From: Vladimir Oltean <olteanv@gmail.com>
Date: 2021-08-11 11:47:31

On Tue, Aug 10, 2021 at 04:58:12PM +0800, Wong Vee Khee wrote:
quoted hunk
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 <vladimir.oltean@nxp.com>
Signed-off-by: Wong Vee Khee <redacted>
---
 drivers/net/pcs/pcs-xpcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 63fda3fc40aa..4bd61339823c 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -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;
 
-- 
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/20210809102229.933748-2-vee.khee.wong@linux.intel.com/
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:

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Fixes: 3ad1d171548e ("net: dsa: sja1105: migrate to xpcs for SGMII")

Re: [PATCH net-next 1/1] net: pcs: xpcs: fix error handling on failed to allocate memory

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-08-11 22:10:08

Hello:

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

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 <vladimir.oltean@nxp.com>
Signed-off-by: Wong Vee Khee <redacted>

[...]
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

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help