2021-06-08 01:41:12

by Zheng Yongjun

Subject: [PATCH v2] 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 +-
net/ipv6/addrconf.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

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)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index b0ef65eb9bd2..701eb82acd1c 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5827,7 +5827,7 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla,
return -EAFNOSUPPORT;

if (nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla, NULL, NULL) < 0)
- BUG();
+ return -EINVAL;

if (tb[IFLA_INET6_TOKEN]) {
err = inet6_set_iftoken(idev, nla_data(tb[IFLA_INET6_TOKEN]),
--
2.25.1

2021-06-08 19:01:08

by patchwork-bot+netdevbpf

Subject: Re: [PATCH v2] net: ipv4: Remove unneed BUG() function

Hello:

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

On Tue, 8 Jun 2021 09:53:15 +0800 you 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 +-
> net/ipv6/addrconf.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Here is the summary with links:
- [v2] net: ipv4: Remove unneed BUG() function
https://git.kernel.org/netdev/net/c/5ac6b198d7e3

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