From bc99f18e84d6d1751670811aaffc9ea36f50b270 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 18 Dec 2023 20:13:16 +0000 Subject: [PATCH] Revert "psample: Require 'CAP_NET_ADMIN' when joining "packets" group" This reverts commit fe8402511ed80ce9a7ee696f457a3d856d52cd47 which is commit 44ec98ea5ea9cfecd31a5c4cc124703cb5442832 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: I2be6c74c85241cd9cad52f7e58830e8f7771ace3 Signed-off-by: Greg Kroah-Hartman --- net/psample/psample.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/psample/psample.c b/net/psample/psample.c index 6d29983cbd07..6f2fbc6b9eb2 100644 --- a/net/psample/psample.c +++ b/net/psample/psample.c @@ -28,8 +28,7 @@ enum psample_nl_multicast_groups { static const struct genl_multicast_group psample_nl_mcgrps[] = { [PSAMPLE_NL_MCGRP_CONFIG] = { .name = PSAMPLE_NL_MCGRP_CONFIG_NAME }, - [PSAMPLE_NL_MCGRP_SAMPLE] = { .name = PSAMPLE_NL_MCGRP_SAMPLE_NAME, - .flags = GENL_UNS_ADMIN_PERM }, + [PSAMPLE_NL_MCGRP_SAMPLE] = { .name = PSAMPLE_NL_MCGRP_SAMPLE_NAME }, }; static struct genl_family psample_nl_family __ro_after_init;