| Message ID | 20210607143909.2844407-1-zhengyongjun3@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: ipv4: Remove unneed BUG() function | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
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.
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.
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)
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(-)