* [PATCH net-next] net: ipv4: Remove unneed BUG() function
@ 2021-06-07 14:39 Zheng Yongjun
2021-06-07 16:20 ` David Ahern
0 siblings, 1 reply; 3+ messages in thread
From: Zheng Yongjun @ 2021-06-07 14:39 UTC (permalink / raw)
To: davem, yoshfuji, dsahern, kuba, netdev, linux-kernel; +Cc: Zheng Yongjun
When 'nla_parse_nested_deprecated' failed, it's no need to
BUG() here, return -EINVAL is ok.
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
---
net/ipv4/devinet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 2e35f68da40a..1c6429c353a9 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1989,7 +1989,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla,
return -EAFNOSUPPORT;
if (nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0)
- BUG();
+ return -EINVAL;
if (tb[IFLA_INET_CONF]) {
nla_for_each_nested(a, tb[IFLA_INET_CONF], rem)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: ipv4: Remove unneed BUG() function
2021-06-07 14:39 [PATCH net-next] net: ipv4: Remove unneed BUG() function Zheng Yongjun
@ 2021-06-07 16:20 ` David Ahern
2021-06-08 1:32 ` 答复: " zhengyongjun
0 siblings, 1 reply; 3+ messages in thread
From: David Ahern @ 2021-06-07 16:20 UTC (permalink / raw)
To: Zheng Yongjun, davem, yoshfuji, dsahern, kuba, netdev,
linux-kernel
On 6/7/21 8:39 AM, Zheng Yongjun wrote:
> When 'nla_parse_nested_deprecated' failed, it's no need to
> BUG() here, return -EINVAL is ok.
>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
> net/ipv4/devinet.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
> index 2e35f68da40a..1c6429c353a9 100644
> --- a/net/ipv4/devinet.c
> +++ b/net/ipv4/devinet.c
> @@ -1989,7 +1989,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla,
> return -EAFNOSUPPORT;
>
> if (nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0)
Avoid assumptions on the failure reason:
int err;
err = nla_parse_nested_deprecated();
if (err < 0)
return err;
> - BUG();
> + return -EINVAL;
>
> if (tb[IFLA_INET_CONF]) {
> nla_for_each_nested(a, tb[IFLA_INET_CONF], rem)
>
seems like this patch and a similar fix for the IPv6 version of
set_link_af should go to net rather than net-next.
^ permalink raw reply [flat|nested] 3+ messages in thread* 答复: [PATCH net-next] net: ipv4: Remove unneed BUG() function
2021-06-07 16:20 ` David Ahern
@ 2021-06-08 1:32 ` zhengyongjun
0 siblings, 0 replies; 3+ messages in thread
From: zhengyongjun @ 2021-06-08 1:32 UTC (permalink / raw)
To: David Ahern, davem@davemloft.net, yoshfuji@linux-ipv6.org,
dsahern@kernel.org, kuba@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
I will do as your advice and send patch v2 :)
-----邮件原件-----
发件人: David Ahern [mailto:dsahern@gmail.com]
发送时间: 2021年6月8日 0:21
收件人: zhengyongjun <zhengyongjun3@huawei.com>; davem@davemloft.net; yoshfuji@linux-ipv6.org; dsahern@kernel.org; kuba@kernel.org; netdev@vger.kernel.org; linux-kernel@vger.kernel.org
主题: Re: [PATCH net-next] net: ipv4: Remove unneed BUG() function
On 6/7/21 8:39 AM, Zheng Yongjun wrote:
> When 'nla_parse_nested_deprecated' failed, it's no need to
> BUG() here, return -EINVAL is ok.
>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
> net/ipv4/devinet.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index
> 2e35f68da40a..1c6429c353a9 100644
> --- a/net/ipv4/devinet.c
> +++ b/net/ipv4/devinet.c
> @@ -1989,7 +1989,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla,
> return -EAFNOSUPPORT;
>
> if (nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla, NULL, NULL)
> < 0)
Avoid assumptions on the failure reason:
int err;
err = nla_parse_nested_deprecated();
if (err < 0)
return err;
> - BUG();
> + return -EINVAL;
>
> if (tb[IFLA_INET_CONF]) {
> nla_for_each_nested(a, tb[IFLA_INET_CONF], rem)
>
seems like this patch and a similar fix for the IPv6 version of set_link_af should go to net rather than net-next.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-08 1:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 14:39 [PATCH net-next] net: ipv4: Remove unneed BUG() function Zheng Yongjun
2021-06-07 16:20 ` David Ahern
2021-06-08 1:32 ` 答复: " zhengyongjun
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.