diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-24 14:29:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-27 13:18:19 -0400 |
commit | a326e6dd315ee38c280b7ecf8a0d777952e384cd (patch) | |
tree | 678e512c939656080acc1efd5336bb1b3160a460 /drivers/net/team | |
parent | 7f8436a1269eaaf2d0b1054a325eddf4e14cb80d (diff) |
team: fix return value check
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>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
-rw-r--r-- | drivers/net/team/team.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 3ffe8a6e3c8b..f8cd61f449a4 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c | |||
@@ -1653,8 +1653,8 @@ static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info) | |||
1653 | 1653 | ||
1654 | hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, | 1654 | hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, |
1655 | &team_nl_family, 0, TEAM_CMD_NOOP); | 1655 | &team_nl_family, 0, TEAM_CMD_NOOP); |
1656 | if (IS_ERR(hdr)) { | 1656 | if (!hdr) { |
1657 | err = PTR_ERR(hdr); | 1657 | err = -EMSGSIZE; |
1658 | goto err_msg_put; | 1658 | goto err_msg_put; |
1659 | } | 1659 | } |
1660 | 1660 | ||
@@ -1848,8 +1848,8 @@ start_again: | |||
1848 | 1848 | ||
1849 | hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags | NLM_F_MULTI, | 1849 | hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags | NLM_F_MULTI, |
1850 | TEAM_CMD_OPTIONS_GET); | 1850 | TEAM_CMD_OPTIONS_GET); |
1851 | if (IS_ERR(hdr)) | 1851 | if (!hdr) |
1852 | return PTR_ERR(hdr); | 1852 | return -EMSGSIZE; |
1853 | 1853 | ||
1854 | if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) | 1854 | if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) |
1855 | goto nla_put_failure; | 1855 | goto nla_put_failure; |
@@ -2068,8 +2068,8 @@ static int team_nl_fill_port_list_get(struct sk_buff *skb, | |||
2068 | 2068 | ||
2069 | hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags, | 2069 | hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags, |
2070 | TEAM_CMD_PORT_LIST_GET); | 2070 | TEAM_CMD_PORT_LIST_GET); |
2071 | if (IS_ERR(hdr)) | 2071 | if (!hdr) |
2072 | return PTR_ERR(hdr); | 2072 | return -EMSGSIZE; |
2073 | 2073 | ||
2074 | if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) | 2074 | if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) |
2075 | goto nla_put_failure; | 2075 | goto nla_put_failure; |