apparmor: use the condition in AA_BUG_FMT even with debug disabled
Subsystems (2)
PATCH 1/1 apparmor: use the condition in AA_BUG_FMT even with debug disabled
This follows the established practice and fixes a build failure for me:security/apparmor/file.c: In function ‘__file_sock_perm’:security/apparmor/file.c:544:24: error: unused variable ‘sock’ [-Werror=unused-variable]
544 | struct socket *sock = (struct socket *) file->private_data;
| ^~~~
---
Plausibly the sock var wants to be eliminated altogether, but I just want this to build.
security/apparmor/include/lib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
security/apparmor/include/lib.h +5 -1
@@ -60,7 +60,11 @@ do { \ #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args)#else -#define AA_BUG_FMT(X, fmt, args...) no_printk(fmt, ##args) +#define AA_BUG_FMT(X, fmt, args...) \ + do { \ + BUILD_BUG_ON_INVALID(X); \ + no_printk(fmt, ##args); \ + } while (0)#endif int aa_parse_debug_params (const char *str);
Signature · 1 line
2.43.0
For the record, a previous patch that removes the sock variable was previously accepted:
https://lists.ubuntu.com/archives/apparmor/2025-January/013449.html
(patch) and https://lists.ubuntu.com/archives/apparmor/2025-January/013463.html
(ack from John Johansen)
Quoted 37 lines · Mateusz Guzik
This follows the established practice and fixes a build failure for me:
security/apparmor/file.c: In function ‘__file_sock_perm’:security/apparmor/file.c:544:24: error: unused variable ‘sock’ [-Werror=unused-variable]
544 | struct socket *sock = (struct socket *)file->private_data;
| ^~~~Signed-off-by Mateusz Guzik <[email protected]>---
Plausibly the sock var wants to be eliminated altogether, but I just want this to build.
security/apparmor/include/lib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)security/apparmor/include/lib.h +5
-2@@ -60,7 +60,11 @@ do { \ #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args)#else -#define AA_BUG_FMT(X, fmt, args...) no_printk(fmt, ##args) +#define AA_BUG_FMT(X, fmt, args...) \ + do { \ + BUILD_BUG_ON_INVALID(X); \ + no_printk(fmt, ##args); \ + } while (0)#endif int aa_parse_debug_params (const char *str); --2.43.0
Quoted 7 lines · Ryan Lee
For the record, a previous patch that removes the sock variable was previously accepted:
https://lists.ubuntu.com/archives/apparmor/2025-January/013449.html
(patch) and https://lists.ubuntu.com/archives/apparmor/2025-January/013463.html
(ack from John Johansen)
That makes sense, but imo the posted patch is still warranted -- all other debug macros (WARN_ON, VM_WARN_ON etc.) are expected to evaluate the condition.
Signature · 1 line
Mateusz Guzik <mjguzik gmail.com>
Quoted 7 lines · Mateusz Guzik
This follows the established practice and fixes a build failure for me:
security/apparmor/file.c: In function ‘__file_sock_perm’:security/apparmor/file.c:544:24: error: unused variable ‘sock’ [-Werror=unused-variable]
544 | struct socket *sock = (struct socket *)file->private_data;
| ^~~~Signed-off-by Mateusz Guzik <[email protected]>
thanks, I have pulled this into my tree
Quoted 25 lines
---
Plausibly the sock var wants to be eliminated altogether, but I just want this to build.
security/apparmor/include/lib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)security/apparmor/include/lib.h +5
-1@@ -60,7 +60,11 @@ do { \ #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args)#else -#define AA_BUG_FMT(X, fmt, args...) no_printk(fmt, ##args) +#define AA_BUG_FMT(X, fmt, args...) \ + do { \ + BUILD_BUG_ON_INVALID(X); \ + no_printk(fmt, ##args); \ + } while (0)#endif int aa_parse_debug_params (const char *str);