From: Jiri Pirko <jiri@resnulli.us>
To: Wei Yongjun <weiyj.lk@gmail.com>
Cc: jpirko@redhat.com, yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org
Subject: Re: [PATCH] team: fix return value check
Date: Tue, 25 Sep 2012 07:40:38 +0200 [thread overview]
Message-ID: <20120925054038.GA1873@minipsycho.orion> (raw)
In-Reply-To: <CAPgLHd9GYYu21FhiKAr2MvmYtWbL=85-E0EzJmiJm6cDDp=WcA@mail.gmail.com>
Tue, Sep 25, 2012 at 06:29:35AM CEST, weiyj.lk@gmail.com wrote:
>From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
>In case of error, the function genlmsg_put() returns NULL pointer
>not ERR_PTR(). The IS_ERR() test in the return value check should
>be replaced with NULL test.
>
>dpatch engine is used to auto generate this patch.
>(https://github.com/weiyj/dpatch)
>
>Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>---
> drivers/net/team/team.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
>index 341b65d..e19da26 100644
>--- a/drivers/net/team/team.c
>+++ b/drivers/net/team/team.c
>@@ -1652,8 +1652,8 @@ static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
>
> hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq,
> &team_nl_family, 0, TEAM_CMD_NOOP);
>- if (IS_ERR(hdr)) {
>- err = PTR_ERR(hdr);
>+ if (!hdr) {
>+ err = -EMSGSIZE;
> goto err_msg_put;
> }
>
>@@ -1847,8 +1847,8 @@ start_again:
>
> hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags | NLM_F_MULTI,
> TEAM_CMD_OPTIONS_GET);
>- if (IS_ERR(hdr))
>- return PTR_ERR(hdr);
>+ if (!hdr)
>+ return -EMSGSIZE;
>
> if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
> goto nla_put_failure;
>@@ -2067,8 +2067,8 @@ static int team_nl_fill_port_list_get(struct sk_buff *skb,
>
> hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags,
> TEAM_CMD_PORT_LIST_GET);
>- if (IS_ERR(hdr))
>- return PTR_ERR(hdr);
>+ if (!hdr)
>+ return -EMSGSIZE;
>
> if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
> goto nla_put_failure;
>
>
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
Acked-by: Jiri Pirko <jiri@resnulli.us>
next prev parent reply other threads:[~2012-09-25 5:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 4:29 [PATCH] team: fix return value check Wei Yongjun
2012-09-25 5:40 ` Jiri Pirko [this message]
2012-09-27 17:18 ` David Miller
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=20120925054038.GA1873@minipsycho.orion \
--to=jiri@resnulli.us \
--cc=jpirko@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=weiyj.lk@gmail.com \
--cc=yongjun_wei@trendmicro.com.cn \
/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).