Revert "apparmor: don't try to replace stale label in ptrace access check"

BugLink: https://bugs.launchpad.net/bugs/1864063
This reverts commit 5b9276f0312a8866928088fa05d170e551b5cd3e.

Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
index 4031bf0d67fa8c333ada7a9ffad8e3bb8abee42c..349ea30882677ddebc0b37289f35fe3a70aff687 100644 (file)
--- a/security/apparmor/include/context.h
+++ b/security/apparmor/include/context.h
@@ -210,8 +210,6 @@ static inline struct aa_label *begin_current_label_crit_section(void)
 {
        struct aa_label *label = aa_current_raw_label();
 
-       might_sleep();
-
        if (label_is_stale(label)) {
                label = aa_get_newest_label(label);
                if (aa_replace_current_label(label) == 0)

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 384da7789d94e3d16c98f651b9fa1a1f337a3710..80da8e51c2fe6ebb0aaf3a1da54e5e5c72d2ea47 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -87,12 +87,12 @@ static int apparmor_ptrace_access_check(struct task_struct *child,
        struct aa_label *tracer, *tracee;
        int error;
 
-       tracer = __begin_current_label_crit_section();
+       tracer = begin_current_label_crit_section();
        tracee = aa_get_task_label(child);
        error = aa_may_ptrace(tracer, tracee,
                  mode == PTRACE_MODE_READ ? AA_PTRACE_READ : AA_PTRACE_TRACE);
        aa_put_label(tracee);
-       __end_current_label_crit_section(tracer);
+       end_current_label_crit_section(tracer);
 
        return error;
 }