From: John Johansen <john.johansen@canonical.com>
Date: Sun, 2 Nov 2025 09:36:57 +0000 (-0800)
Subject: apparmor: fix label and profile debug macros
X-Git-Tag: v7.0-rc1~35^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1301b956190590ef7f64b321fd27c59907d9c271;p=thirdparty%2Flinux.git

apparmor: fix label and profile debug macros

The label and profile debug macros were not correctly pasting their
var args.

Reviewed-by: Georgia Garcia <georgia.garcia@canonical.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
---

diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
index 7ca8a92c449c..73ec624fd8c4 100644
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -47,9 +47,11 @@ extern struct aa_dfa *stacksplitdfa;
 #define AA_DEBUG_LABEL(LAB, X, fmt, args...)				\
 do {									\
 	if ((LAB)->flags & FLAG_DEBUG1)					\
-		AA_DEBUG(X, fmt, args);					\
+		AA_DEBUG(X, fmt, ##args);				\
 } while (0)
 
+#define AA_DEBUG_PROFILE(PROF, X, fmt...) AA_DEBUG_LABEL(&(PROF)->label, X, ##fmt)
+
 #define AA_WARN(X) WARN((X), "APPARMOR WARN %s: %s\n", __func__, #X)
 
 #define AA_BUG(X, args...)						    \