Revert "net: rtnetlink: add helper to extract msg type's kind"

This reverts commit 85c154222d which is
commit 2e9ea3e30f696fd438319c07836422bb0bbb4608 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I8cde97f239eaf15d952948581987bfa4f1bcb28b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2025-10-31 07:58:48 +00:00
commit 3f77162543
2 changed files with 1 additions and 7 deletions

View file

@ -19,12 +19,6 @@ enum rtnl_kinds {
RTNL_KIND_GET,
RTNL_KIND_SET
};
#define RTNL_KIND_MASK 0x3
static inline enum rtnl_kinds rtnl_msgtype_kind(int msgtype)
{
return msgtype & RTNL_KIND_MASK;
}
void rtnl_register(int protocol, int msgtype,
rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);

View file

@ -5212,7 +5212,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
return 0;
family = ((struct rtgenmsg *)nlmsg_data(nlh))->rtgen_family;
kind = rtnl_msgtype_kind(type);
kind = type&3;
if (kind != RTNL_KIND_GET && !netlink_net_capable(skb, CAP_NET_ADMIN))
return -EPERM;