| From 452243244eefef1a0acfe8a61b90b6ab01d0980e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 8 Jun 2021 09:53:15 +0800 |
| Subject: net: ipv4: Remove unneed BUG() function |
| |
| From: Zheng Yongjun <zhengyongjun3@huawei.com> |
| |
| [ Upstream commit 5ac6b198d7e312bd10ebe7d58c64690dc59cc49a ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 a9e53f5942fa..eab0a46983c0 100644 |
| --- a/net/ipv6/addrconf.c |
| +++ b/net/ipv6/addrconf.c |
| @@ -5822,7 +5822,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.30.2 |
| |
