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

Commit 49a04248 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "BACKPORT: perf_event: Add support for LSM and SELinux checks" 



This reverts commit 3605586e as it
breaks the build :(

Cc: Ryan Savitski <rsavitski@google.com>
Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 93162f2a

arch/powerpc/perf/core-book3s.c

+10 −8
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static inline unsigned long perf_ip_adjust(struct pt_regs *regs) 
{

	return 0;

}

static inline void perf_get_data_addr(struct perf_event *event, struct pt_regs *regs, u64 *addrp) { }

static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) { }

static inline u32 perf_get_misc_flags(struct pt_regs *regs)

{

	return 0;
@@ -127,7 +127,7 @@ static unsigned long ebb_switch_in(bool ebb, struct cpu_hw_events *cpuhw) 
static inline void power_pmu_bhrb_enable(struct perf_event *event) {}

static inline void power_pmu_bhrb_disable(struct perf_event *event) {}

static void power_pmu_sched_task(struct perf_event_context *ctx, bool sched_in) {}

static inline void power_pmu_bhrb_read(struct perf_event *event, struct cpu_hw_events *cpuhw) {}

static inline void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw) {}

static void pmao_restore_workaround(bool ebb) { }

#endif /* CONFIG_PPC32 */
@@ -179,7 +179,7 @@ static inline unsigned long perf_ip_adjust(struct pt_regs *regs) 
 * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC, the

 * [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA, or the SDAR_VALID bit in SIER.

 */

static inline void perf_get_data_addr(struct perf_event *event, struct pt_regs *regs, u64 *addrp)

static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp)

{

	unsigned long mmcra = regs->dsisr;

	bool sdar_valid;
@@ -204,7 +204,8 @@ static inline void perf_get_data_addr(struct perf_event *event, struct pt_regs * 
	if (!(mmcra & MMCRA_SAMPLE_ENABLE) || sdar_valid)

		*addrp = mfspr(SPRN_SDAR);



	if (is_kernel_addr(mfspr(SPRN_SDAR)) && perf_allow_kernel(&event->attr) != 0)

	if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN) &&

		is_kernel_addr(mfspr(SPRN_SDAR)))

		*addrp = 0;

}
@@ -443,7 +444,7 @@ static __u64 power_pmu_bhrb_to(u64 addr) 
}



/* Processing BHRB entries */

static void power_pmu_bhrb_read(struct perf_event *event, struct cpu_hw_events *cpuhw)

static void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw)

{

	u64 val;

	u64 addr;
@@ -471,7 +472,8 @@ static void power_pmu_bhrb_read(struct perf_event *event, struct cpu_hw_events * 
			 * exporting it to userspace (avoid exposure of regions

			 * where we could have speculative execution)

			 */

			if (is_kernel_addr(addr) && perf_allow_kernel(&event->attr) != 0)

			if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN) &&

				is_kernel_addr(addr))

				continue;



			/* Branches are read most recent first (ie. mfbhrb 0 is
@@ -2085,12 +2087,12 @@ static void record_and_restart(struct perf_event *event, unsigned long val, 


		if (event->attr.sample_type &

		    (PERF_SAMPLE_ADDR | PERF_SAMPLE_PHYS_ADDR))

			perf_get_data_addr(event, regs, &data.addr);

			perf_get_data_addr(regs, &data.addr);



		if (event->attr.sample_type & PERF_SAMPLE_BRANCH_STACK) {

			struct cpu_hw_events *cpuhw;

			cpuhw = this_cpu_ptr(&cpu_hw_events);

			power_pmu_bhrb_read(event, cpuhw);

			power_pmu_bhrb_read(cpuhw);

			data.br_stack = &cpuhw->bhrb_stack;

		}

arch/x86/events/intel/bts.c

+3 −5
Original line number Diff line number Diff line
@@ -549,11 +549,9 @@ static int bts_event_init(struct perf_event *event) 
	 * Note that the default paranoia setting permits unprivileged

	 * users to profile the kernel.

	 */

	if (event->attr.exclude_kernel) {

		ret = perf_allow_kernel(&event->attr);

		if (ret)

			return ret;

	}

	if (event->attr.exclude_kernel && perf_paranoid_kernel() &&

	    !capable(CAP_SYS_ADMIN))

		return -EACCES;



	if (x86_add_exclusive(x86_lbr_exclusive_bts))

		return -EBUSY;

arch/x86/events/intel/core.c

+2 −3
Original line number Diff line number Diff line
@@ -3315,9 +3315,8 @@ static int intel_pmu_hw_config(struct perf_event *event) 
	if (x86_pmu.version < 3)

		return -EINVAL;



	ret = perf_allow_cpu(&event->attr);

	if (ret)

		return ret;

	if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))

		return -EACCES;



	event->hw.config |= ARCH_PERFMON_EVENTSEL_ANY;

arch/x86/events/intel/p4.c

+2 −3
Original line number Diff line number Diff line
@@ -776,9 +776,8 @@ static int p4_validate_raw_event(struct perf_event *event) 
	 * the user needs special permissions to be able to use it

	 */

	if (p4_ht_active() && p4_event_bind_map[v].shared) {

		v = perf_allow_cpu(&event->attr);

		if (v)

			return v;

		if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))

			return -EACCES;

	}



	/* ESCR EventMask bits may be invalid */

include/linux/lsm_hooks.h

+0 −15
Original line number Diff line number Diff line
@@ -1818,14 +1818,6 @@ union security_list_options { 
	void (*bpf_prog_free_security)(struct bpf_prog_aux *aux);

#endif /* CONFIG_BPF_SYSCALL */

	int (*locked_down)(enum lockdown_reason what);

#ifdef CONFIG_PERF_EVENTS

	int (*perf_event_open)(struct perf_event_attr *attr, int type);

	int (*perf_event_alloc)(struct perf_event *event);

	void (*perf_event_free)(struct perf_event *event);

	int (*perf_event_read)(struct perf_event *event);

	int (*perf_event_write)(struct perf_event *event);



#endif

};



struct security_hook_heads {
@@ -2068,13 +2060,6 @@ struct security_hook_heads { 
	struct hlist_head bpf_prog_free_security;

#endif /* CONFIG_BPF_SYSCALL */

	struct hlist_head locked_down;

#ifdef CONFIG_PERF_EVENTS

	struct hlist_head perf_event_open;

	struct hlist_head perf_event_alloc;

	struct hlist_head perf_event_free;

	struct hlist_head perf_event_read;

	struct hlist_head perf_event_write;

#endif

} __randomize_layout;



/*