2021-06-07 14:27:23

by Zheng Yongjun

Subject: [PATCH net-next] net: ipv4: Remove unneed BUG() function

When 'nla_parse_nested_deprecated' failed, it's no need to
BUG() here, return -EINVAL is ok.

Signed-off-by: Zheng Yongjun <[email protected]>
---
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

2021-06-07 16:31:53

by David Ahern

Subject: 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 <[email protected]>
> ---
> 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.

2021-06-08 01:34:51

by Zheng Yongjun

Subject: 答复: [PATCH net-next] net: ipv4: Remove un need BUG() function

I will do as your advice and send patch v2 :)

-----邮件原件-----
发件人: David Ahern [mailto:[email protected]]
发送时间: 2021年6月8日 0:21
收件人: zhengyongjun <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
主题: 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 <[email protected]>
> ---
> 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.