From: Greg Kroah-Hartman Date: Mon, 20 Jul 2026 11:28:13 +0000 (+0200) Subject: fix up some apparmor build breaks in 5.10 and 5.15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9043f363c29b973574be9973c37a33c7be80aa5;p=thirdparty%2Fkernel%2Fstable-queue.git fix up some apparmor build breaks in 5.10 and 5.15 --- diff --git a/queue-5.10/apparmor-fix-label-can-not-be-immediately-before-a-d.patch b/queue-5.10/apparmor-fix-label-can-not-be-immediately-before-a-d.patch index 96f4094f63..8f2fa9e4a0 100644 --- a/queue-5.10/apparmor-fix-label-can-not-be-immediately-before-a-d.patch +++ b/queue-5.10/apparmor-fix-label-can-not-be-immediately-before-a-d.patch @@ -26,25 +26,20 @@ Fixes: 7b42f95813dc9 ("apparmor: fix potential UAF in aa_replace_profiles") Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- - security/apparmor/policy.c | 3 ++- + security/apparmor/policy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index addffa1000af33..35f0cd32ed9e92 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c -@@ -1106,9 +1106,10 @@ ssize_t aa_replace_profiles(struct aa_ns *policy_ns, struct aa_label *label, +@@ -1107,9 +1107,10 @@ ssize_t aa_replace_profiles(struct aa_ns mutex_unlock(&ns->lock); out: + aa_put_ns(ns); + - ssize_t udata_sz = udata->size; + udata_sz = udata->size; - aa_put_ns(ns); aa_put_profile_loaddata(udata); kfree(ns_name); --- -2.53.0 - diff --git a/queue-5.10/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch b/queue-5.10/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch index 2b215c30f8..448bd060be 100644 --- a/queue-5.10/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch +++ b/queue-5.10/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch @@ -22,18 +22,24 @@ Signed-off-by: Maxime Bélair Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- - security/apparmor/policy.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + security/apparmor/policy.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index 46d84d3a099866..addffa1000af33 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c -@@ -1106,13 +1106,15 @@ ssize_t aa_replace_profiles(struct aa_ns *policy_ns, struct aa_label *label, +@@ -922,6 +922,7 @@ ssize_t aa_replace_profiles(struct aa_ns + struct aa_loaddata *rawdata_ent; + const char *op; + ssize_t count, error; ++ ssize_t udata_sz; + LIST_HEAD(lh); + + op = mask & AA_MAY_REPLACE_POLICY ? OP_PROF_REPL : OP_PROF_LOAD; +@@ -1106,13 +1107,15 @@ ssize_t aa_replace_profiles(struct aa_ns mutex_unlock(&ns->lock); out: -+ ssize_t udata_sz = udata->size; ++ udata_sz = udata->size; + aa_put_ns(ns); aa_put_profile_loaddata(udata); @@ -46,6 +52,3 @@ index 46d84d3a099866..addffa1000af33 100644 fail_lock: mutex_unlock(&ns->lock); --- -2.53.0 - diff --git a/queue-5.15/apparmor-fix-label-can-not-be-immediately-before-a-d.patch b/queue-5.15/apparmor-fix-label-can-not-be-immediately-before-a-d.patch index a7b8bc9e04..780b82d816 100644 --- a/queue-5.15/apparmor-fix-label-can-not-be-immediately-before-a-d.patch +++ b/queue-5.15/apparmor-fix-label-can-not-be-immediately-before-a-d.patch @@ -26,25 +26,20 @@ Fixes: 7b42f95813dc9 ("apparmor: fix potential UAF in aa_replace_profiles") Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- - security/apparmor/policy.c | 3 ++- + security/apparmor/policy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index addffa1000af33..35f0cd32ed9e92 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c -@@ -1106,9 +1106,10 @@ ssize_t aa_replace_profiles(struct aa_ns *policy_ns, struct aa_label *label, +@@ -1107,9 +1107,10 @@ ssize_t aa_replace_profiles(struct aa_ns mutex_unlock(&ns->lock); out: + aa_put_ns(ns); + - ssize_t udata_sz = udata->size; + udata_sz = udata->size; - aa_put_ns(ns); aa_put_profile_loaddata(udata); kfree(ns_name); --- -2.53.0 - diff --git a/queue-5.15/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch b/queue-5.15/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch index fa59172ea0..d690a467e5 100644 --- a/queue-5.15/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch +++ b/queue-5.15/apparmor-fix-potential-uaf-in-aa_replace_profiles.patch @@ -22,18 +22,24 @@ Signed-off-by: Maxime Bélair Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- - security/apparmor/policy.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + security/apparmor/policy.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index 46d84d3a099866..addffa1000af33 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c -@@ -1106,13 +1106,15 @@ ssize_t aa_replace_profiles(struct aa_ns *policy_ns, struct aa_label *label, +@@ -922,6 +922,7 @@ ssize_t aa_replace_profiles(struct aa_ns + struct aa_loaddata *rawdata_ent; + const char *op; + ssize_t count, error; ++ ssize_t udata_sz; + LIST_HEAD(lh); + + op = mask & AA_MAY_REPLACE_POLICY ? OP_PROF_REPL : OP_PROF_LOAD; +@@ -1106,13 +1107,15 @@ ssize_t aa_replace_profiles(struct aa_ns mutex_unlock(&ns->lock); out: -+ ssize_t udata_sz = udata->size; ++ udata_sz = udata->size; + aa_put_ns(ns); aa_put_profile_loaddata(udata); @@ -46,6 +52,3 @@ index 46d84d3a099866..addffa1000af33 100644 fail_lock: mutex_unlock(&ns->lock); --- -2.53.0 -