Commit ab9b34b6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Wang Yufen
Browse files

Revert "rtnetlink: Reject negative ifindexes in RTM_NEWLINK" 

stable inclusion
from stable-v4.19.296
commit 88f8a01c42535285bcf2666d1f7eb9ada0de88cc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8XA2F


CVE: NA

--------------------------------

This reverts commit 42c8406432e730cb7442d97ecfdbf47084a5af4d which is
commit 30188bd7 upstream.

It was improperly backported to 4.19.y, and applied to the wrong
function, which obviously causes problems.  A fixed version will be
applied as a separate commit later.

Reported-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/ZSQeA8fhUT++iZvz@ostr-mac


Cc: Ido Schimmel <idosch@nvidia.com>
Cc: Jiri Pirko <jiri@nvidia.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWang Yufen <wangyufen@huawei.com>
parent 304fb2de

net/core/rtnetlink.c

+1 −4
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;