diff options
| author | John Johansen <john.johansen@canonical.com> | 2021-09-03 08:27:31 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2021-11-03 09:08:15 +0100 |
| commit | 4d47fbbe54bf75b72eac3f5a0caa664300937620 (patch) | |
| tree | 62b70be6926976735356b2b9dbc466334a925c32 /security | |
| parent | apparmor: use per file locks for transactional queries (diff) | |
| download | linux-4d47fbbe54bf75b72eac3f5a0caa664300937620.tar.xz linux-4d47fbbe54bf75b72eac3f5a0caa664300937620.zip | |
apparmor: fix zero-length compiler warning in AA_BUG()
Uses of AA_BUG() without a message can result in the compiler warning
warning: zero-length gnu_printf format string [-Wformat-zero-length]
Fix this with a pragma for now. A larger rework of AA_BUG() will
follow.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/include/lib.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h index 67fbb81a11f3..e2e8df0c6f1c 100644 --- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h @@ -31,7 +31,12 @@ #define AA_WARN(X) WARN((X), "APPARMOR WARN %s: %s\n", __func__, #X) -#define AA_BUG(X, args...) AA_BUG_FMT((X), "" args) +#define AA_BUG(X, args...) \ + do { \ + _Pragma("GCC diagnostic ignored \"-Wformat-zero-length\""); \ + AA_BUG_FMT((X), "" args); \ + _Pragma("GCC diagnostic warning \"-Wformat-zero-length\""); \ + } while (0) #ifdef CONFIG_SECURITY_APPARMOR_DEBUG_ASSERTS #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args) |