* [PATCH] net: hsr: Add error handling in hsr_portdev_setup()
@ 2023-09-23 12:24 liuhaoran
2023-09-28 13:05 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: liuhaoran @ 2023-09-23 12:24 UTC (permalink / raw)
To: davem; +Cc: edumazet, kuba, pabeni, netdev, liuhaoran
This patch adds error-handling for the hsr_port_get_hsr()
inside the hsr_portdev_setup().
Signed-off-by: liuhaoran <liuhaoran14@163•com>
---
net/hsr/hsr_slave.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index e5742f2a2d52..ac7d6bdef47e 100644
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -141,6 +141,10 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
}
master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
+
+ if (!master)
+ return -ENODEV;
+
hsr_dev = master->dev;
res = netdev_upper_dev_link(dev, hsr_dev, extack);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: hsr: Add error handling in hsr_portdev_setup()
2023-09-23 12:24 [PATCH] net: hsr: Add error handling in hsr_portdev_setup() liuhaoran
@ 2023-09-28 13:05 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2023-09-28 13:05 UTC (permalink / raw)
To: liuhaoran; +Cc: davem, edumazet, kuba, pabeni, netdev
On Sat, Sep 23, 2023 at 08:24:02PM +0800, liuhaoran wrote:
> This patch adds error-handling for the hsr_port_get_hsr()
> inside the hsr_portdev_setup().
>
> Signed-off-by: liuhaoran <liuhaoran14@163•com>
Please sign off using your real name, which is commonly of the form:
Signed-off-by: First Last <me@example•com>
Please consider targeting this against 'net' as it appears to be a bug fix.
Subject: [PATCH net] ...
If not, please target the patch against net-next.
If so, please consider using including a fixes tag, immediately
above your Signed-off-by (and any other) tags.
This may be the correct tag, but I'm not completely sure.
Fixes: e0a4b99773d3 ("hsr: use upper/lower device infrastructure")
> ---
> net/hsr/hsr_slave.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
> index e5742f2a2d52..ac7d6bdef47e 100644
> --- a/net/hsr/hsr_slave.c
> +++ b/net/hsr/hsr_slave.c
> @@ -141,6 +141,10 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
> }
>
> master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
> +
> + if (!master)
> + return -ENODEV;
I think this needs to jump to an unwind label.
goto fail_upper_dev_link;
But I also think the unwind label should be renamed.
to reflect what they do, rather than where they are called from.
--
pw-bot: changes-requested
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-28 13:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-23 12:24 [PATCH] net: hsr: Add error handling in hsr_portdev_setup() liuhaoran
2023-09-28 13:05 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox