Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a326e6dd authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f8436a1

drivers/net/team/team.c

+6 −6
Original line number Diff line number Diff line
@@ -1653,8 +1653,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;

	}
@@ -1848,8 +1848,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;
@@ -2068,8 +2068,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;