]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: ipv4: Remove unneed BUG() function
authorZheng Yongjun <zhengyongjun3@huawei.com>
Tue, 8 Jun 2021 01:53:15 +0000 (09:53 +0800)
committerSasha Levin <sashal@kernel.org>
Wed, 30 Jun 2021 12:47:46 +0000 (08:47 -0400)
[ 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
net/ipv6/addrconf.c

index a27d034c85ccbb7f1740b3ef9abdccbdcf3a810d..603a3495afa62110e3bf3d9a942675f1dd3ed9fa 100644 (file)
@@ -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)
index 52feab2baeee5b1a01ccd1120f8ab5b4a1776403..366c3792b86045eac44e20e7e9db96b8bde80bc3 100644 (file)
@@ -5761,7 +5761,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]));