Răsfoiți Sursa

apparmor: fix ptrace read check

The ptrace read check is incorrect resulting in policy that is
broader than it needs to be. Fix the check so that read access
permission can be properly detected when other ptrace flags are
set.

Fixes: b2d09ae449ce ("apparmor: move ptrace checks to using labels")
Signed-off-by: John Johansen <john.johansen@canonical.com>
John Johansen 7 ani în urmă
părinte
comite
338d0be437
1 a modificat fișierele cu 2 adăugiri și 1 ștergeri
  1. 2 1
      security/apparmor/lsm.c

+ 2 - 1
security/apparmor/lsm.c

@@ -117,7 +117,8 @@ static int apparmor_ptrace_access_check(struct task_struct *child,
 	tracer = begin_current_label_crit_section();
 	tracer = begin_current_label_crit_section();
 	tracee = aa_get_task_label(child);
 	tracee = aa_get_task_label(child);
 	error = aa_may_ptrace(tracer, tracee,
 	error = aa_may_ptrace(tracer, tracee,
-		  mode == PTRACE_MODE_READ ? AA_PTRACE_READ : AA_PTRACE_TRACE);
+			(mode & PTRACE_MODE_READ) ? AA_PTRACE_READ
+						  : AA_PTRACE_TRACE);
 	aa_put_label(tracee);
 	aa_put_label(tracee);
 	end_current_label_crit_section(tracer);
 	end_current_label_crit_section(tracer);