| Message ID | 20210927100919.1500526-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] apparmor: avoid -Wempty-body warning | expand |
On 9/27/21 3:09 AM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > Arnd, yep my bad for various reasons I haven't done a merge request since then. I can pickout a set of minor fixes including this and send them up this week. - john > Building with 'make W=1' shows a warning for an empty macro: > > security/apparmor/label.c: In function '__label_update': > security/apparmor/label.c:2096:59: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body] > 2096 | AA_BUG(labels_ns(label) != labels_ns(new)); > > Change the macro defintion to use no_printk(), which improves > format string checking and avoids the warning. > > Acked-by: John Johansen <john.johansen@canonical.com> > Link: https://lore.kernel.org/all/4e3e409e-c72e-edd5-379a-60883f166405@canonical.com/ > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > I sentn this back in April, and John replied that it's in the apparmor > tree, but the fix is still missing as of v5.15-rc2. > > Please double-check and re-apply if necessary. > --- > security/apparmor/include/lib.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h > index 7d27db740bc2..394130a0f3a4 100644 > --- a/security/apparmor/include/lib.h > +++ b/security/apparmor/include/lib.h > @@ -36,7 +36,7 @@ > #define AA_BUG_FMT(X, fmt, args...) \ > WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args) > #else > -#define AA_BUG_FMT(X, fmt, args...) > +#define AA_BUG_FMT(X, fmt, args...) no_printk("Apparmor WARN" fmt, ##args) > #endif > > #define AA_ERROR(fmt, args...) \ >
On Mon, Sep 27, 2021 at 9:59 PM John Johansen <john.johansen@canonical.com> wrote: > > On 9/27/21 3:09 AM, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > > > Arnd, yep my bad for various reasons I haven't done a merge request since then. Ok, no worries. I was just going through my backlog of stuff that is still needed for clean randconfig builds. > I can pickout a set of minor fixes including this and send them up this week. Thanks! Arnd
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h index 7d27db740bc2..394130a0f3a4 100644 --- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h @@ -36,7 +36,7 @@ #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args) #else -#define AA_BUG_FMT(X, fmt, args...) +#define AA_BUG_FMT(X, fmt, args...) no_printk("Apparmor WARN" fmt, ##args) #endif #define AA_ERROR(fmt, args...) \