From: yuan linyu <cugyly@163.com>
To: netdev@vger.kernel.org
Cc: "David S . Miller" <davem@davemloft.net>,
yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Subject: [PATCH net-next v3] net: assign err to 0 at begin in do_setlink() function
Date: Thu, 16 Nov 2017 19:59:48 +0800 [thread overview]
Message-ID: <1510833588-3841-1-git-send-email-cugyly@163.com> (raw)
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
each netlink attribute have proper process when error happen,
when exit one attribute process, it implies that no error,
so err = 0; is useless.
assign err = 0; at beginning if all attributes not set.
v1 -> v2:
fix review comment from David, clear err before
nla_for_each_nested()
v2 -> v3:
maybe wrong understanding of David comment,
provide a new version
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
---
net/core/rtnetlink.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index dabba2a..54f792b 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2075,7 +2075,7 @@ static int do_setlink(const struct sk_buff *skb,
struct nlattr **tb, char *ifname, int status)
{
const struct net_device_ops *ops = dev->netdev_ops;
- int err;
+ int err = 0;
if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]) {
struct net *net = rtnl_link_get_net(dev_net(dev), tb);
@@ -2253,7 +2253,6 @@ static int do_setlink(const struct sk_buff *skb,
status |= DO_SETLINK_NOTIFY;
}
}
- err = 0;
if (tb[IFLA_VF_PORTS]) {
struct nlattr *port[IFLA_PORT_MAX+1];
@@ -2261,9 +2260,10 @@ static int do_setlink(const struct sk_buff *skb,
int vf;
int rem;
- err = -EOPNOTSUPP;
- if (!ops->ndo_set_vf_port)
+ if (!ops->ndo_set_vf_port) {
+ err = -EOPNOTSUPP;
goto errout;
+ }
nla_for_each_nested(attr, tb[IFLA_VF_PORTS], rem) {
if (nla_type(attr) != IFLA_VF_PORT ||
@@ -2286,7 +2286,6 @@ static int do_setlink(const struct sk_buff *skb,
status |= DO_SETLINK_NOTIFY;
}
}
- err = 0;
if (tb[IFLA_PORT_SELF]) {
struct nlattr *port[IFLA_PORT_MAX+1];
@@ -2326,7 +2325,6 @@ static int do_setlink(const struct sk_buff *skb,
status |= DO_SETLINK_NOTIFY;
}
}
- err = 0;
if (tb[IFLA_PROTO_DOWN]) {
err = dev_change_proto_down(dev,
--
2.7.4
next reply other threads:[~2017-11-16 12:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 11:59 yuan linyu [this message]
2017-11-17 6:08 ` [PATCH net-next v3] net: assign err to 0 at begin in do_setlink() function David Miller
2017-11-19 1:59 ` yuan linyu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1510833588-3841-1-git-send-email-cugyly@163.com \
--to=cugyly@163.com \
--cc=Linyu.Yuan@alcatel-sbell.com.cn \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).