leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apparmor: avoid -Wempty-body warning

Browse Source 
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 definition to use no_printk(), which improves
format string checking and avoids the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Arnd Bergmann
2021-03-22 12:00:08 +01:00
committed by John Johansen
parent dc155617fa
commit c75ea02409
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/apparmor/include/lib.h
View File

@@ -36,7 +36,7 @@
#define AA_BUG_FMT(X, fmt, args...) \ #define AA_BUG_FMT(X, fmt, args...) \
WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args) WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args)
#else #else
#define AA_BUG_FMT(X, fmt, args...) #define AA_BUG_FMT(X, fmt, args...) no_printk(fmt, ##args)
#endif #endif
#define AA_ERROR(fmt, args...) \ #define AA_ERROR(fmt, args...) \