From 13a2c8a68f387d5a4609f25f769f55312e8ae1a7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 31 Oct 2025 07:55:49 +0000 Subject: [PATCH] Revert "rtnetlink: Allow deleting FDB entries in user namespace" This reverts commit 509da3463fdfe040927f2270f767ca65821a9302 which is commit bf29555f5bdc017bac22ca66fcb6c9f46ec8788f 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: Id85d10ca56c12b015364a2440c540f6d89203366 Signed-off-by: Greg Kroah-Hartman --- net/core/rtnetlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 76ff9a35ccf6..ebe1f665e07f 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3836,6 +3836,9 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, int err; u16 vid; + if (!netlink_capable(skb, CAP_NET_ADMIN)) + return -EPERM; + if (!del_bulk) { err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);