summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-10-09 20:25:00 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-10-10 21:43:42 +0200
commit923b555ec5249ed9afb172c8e86b9b8dc8a5af9a (patch)
treeb99ae830b0ebbd330d4c7205f91b36fe8bf0b29b
parent756d7671f0063053a21d592fec4cf966c884f0be (diff)
downloadlinux-923b555ec5249ed9afb172c8e86b9b8dc8a5af9a.tar.gz
linux-923b555ec5249ed9afb172c8e86b9b8dc8a5af9a.tar.bz2
linux-923b555ec5249ed9afb172c8e86b9b8dc8a5af9a.zip
Revert "rtnetlink: Reject negative ifindexes in RTM_NEWLINK"
This reverts commit 69197b2b2a7bcf92b209490639316af5dc751cc0 which is commit 30188bd7838c16a98a520db1fe9df01ffc6ed368 upstream. It was improperly backported to 4.14.y, and applied to the wrong function, which obviously causes problems. A fixed version will be applied as a separate commit later. Reported-by: Boris 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/core/rtnetlink.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 0478f8cddd96..a76f3024687f 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2311,10 +2311,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;