Unverified Commit 81353187 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4080 rtnetlink: Reject negative ifindexes in RTM_NEWLINK 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Yufen <wangyufen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3A2TMLRDWBCHZ3QVEVQORWJM3YRLIXK5/ 
Greg Kroah-Hartman (1):
  Revert "rtnetlink: Reject negative ifindexes in RTM_NEWLINK"

Ido Schimmel (1):
  rtnetlink: Reject negative ifindexes in RTM_NEWLINK


-- 
1.8.3.1
 
https://gitee.com/openeuler/kernel/issues/I8XA2F 
 
Link:https://gitee.com/openeuler/kernel/pulls/4080

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 304fb2de 78aea8e0

net/core/rtnetlink.c

+6 −6
Original line number Diff line number Diff line
@@ -2702,10 +2702,7 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	ifm = nlmsg_data(nlh);

	if (ifm->ifi_index > 0)

		dev = __dev_get_by_index(net, ifm->ifi_index);

	else if (ifm->ifi_index < 0) {

		NL_SET_ERR_MSG(extack, "ifindex can't be negative");

		return -EINVAL;

	} else if (tb[IFLA_IFNAME])

	else if (tb[IFLA_IFNAME])

		dev = __dev_get_by_name(net, ifname);

	else

		goto errout;
@@ -2973,9 +2970,12 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
		ifname[0] = '\0';



	ifm = nlmsg_data(nlh);

	if (ifm->ifi_index > 0)

	if (ifm->ifi_index > 0) {

		dev = __dev_get_by_index(net, ifm->ifi_index);

	else {

	} else if (ifm->ifi_index < 0) {

		NL_SET_ERR_MSG(extack, "ifindex can't be negative");

		return -EINVAL;

	} else {

		if (ifname[0])

			dev = __dev_get_by_name(net, ifname);

		else