Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0ec744 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Revert "psample: Require 'CAP_NET_ADMIN' when joining "packets" group" 



This reverts commit ac38a8b3 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: I3d4b14b952996ab0bb272e20e4ec6e32cdaf9688
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent fe136069

net/psample/psample.c

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,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;