audit: avoid -Wempty-body warning
PATCH 1/1 audit: avoid -Wempty-body warning
From: Arnd Bergmann <[email protected]>
gcc warns about an empty statement when audit_remove_mark is defined to nothing:
kernel/auditfilter.c: In function 'audit_data_to_entry':kernel/auditfilter.c:609:51: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
609 | audit_remove_mark(entry->rule.exe); /* that's the template one */
| ^
Change the macros to use the usual "do { } while (0)" instead, and change a few more that were (void)0, for consistency.
--- kernel/audit.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/audit.h +4 -4
@@ -302,8 +302,8 @@ extern struct list_head *audit_killed_trees(void);#define audit_alloc_mark (k, p, l) (ERR_PTR(-EINVAL))#define audit_mark_path (m) "" -#define audit_remove_mark (m) -#define audit_remove_mark_rule (k) +#define audit_remove_mark (m) do { } while (0) +#define audit_remove_mark_rule (k) do { } while (0)#define audit_mark_compare (m, i, d) 0#define audit_exe_compare (t, m) (-EINVAL)#define audit_dupe_exe (n, o) (-EINVAL)
@@ -311,8 +311,8 @@ extern struct list_head *audit_killed_trees(void);#define audit_remove_tree_rule (rule) BUG()#define audit_add_tree_rule (rule) -EINVAL#define audit_make_tree (rule, str, op) -EINVAL -#define audit_trim_trees () (void)0 -#define audit_put_tree (tree) (void)0 +#define audit_trim_trees () do { } while (0) +#define audit_put_tree (tree) do { } while (0)#define audit_tag_tree (old, new) -EINVAL#define audit_tree_path (rule) ""/* never called */ #define audit_kill_trees (context) BUG()
Signature · 1 line
2.29.2
Quoted 5 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
gcc warns about an empty statement when
audit_remove_markis defined to nothing:
Quoted 7 lines
kernel/auditfilter.c: In function 'audit_data_to_entry':kernel/auditfilter.c:609:51: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
609 |audit_remove_mark(entry->rule.exe); /* that's the template one */
| ^Change the macros to use the usual "do { } while (0)" instead, and change a few more that were (void)0, for consistency.
So what about audit_put_watch() and audit_get_watch() which are set to
{}? (And all of include/linux/audit.h that uses the latter...) Does
this only matter if they are the only action called in an if or loop?
Quoted 34 lines
Signed-off-by Arnd Bergmann <[email protected]>--- kernel/audit.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)kernel/audit.h +4
-4@@ -302,8 +302,8 @@ extern struct list_head *audit_killed_trees(void);#define audit_alloc_mark (k, p, l) (ERR_PTR(-EINVAL))#define audit_mark_path (m) "" -#define audit_remove_mark (m) -#define audit_remove_mark_rule (k) +#define audit_remove_mark (m) do { } while (0) +#define audit_remove_mark_rule (k) do { } while (0)#define audit_mark_compare (m, i, d) 0#define audit_exe_compare (t, m) (-EINVAL)#define audit_dupe_exe (n, o) (-EINVAL)@@ -311,8 +311,8 @@ extern struct list_head *audit_killed_trees(void);#define audit_remove_tree_rule (rule) BUG()#define audit_add_tree_rule (rule) -EINVAL#define audit_make_tree (rule, str, op) -EINVAL -#define audit_trim_trees () (void)0 -#define audit_put_tree (tree) (void)0 +#define audit_trim_trees () do { } while (0) +#define audit_put_tree (tree) do { } while (0)#define audit_tag_tree (old, new) -EINVAL#define audit_tree_path (rule) ""/* never called */ #define audit_kill_trees (context) BUG()Signature · 1 line
2.29.2
- RGB
--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635
--
Linux-audit mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/linux-audit
Quoted 7 lines · Richard Guy Briggs
Quoted 2 lines
Change the macros to use the usual "do { } while (0)" instead, and change a few more that were (void)0, for consistency.
So what about
audit_put_watch()andaudit_get_watch()which are set to
{}? (And all ofinclude/linux/audit.hthat uses the latter...) Does
this only matter if they are the only action called in an if or loop?
I missed those, thanks for pointing it out. I sent a v2 patch now.
Arnd
Quoted 9 lines · Arnd Bergmann
Quoted 6 lines · Richard Guy Briggs
Quoted 2 lines
Change the macros to use the usual "do { } while (0)" instead, and change a few more that were (void)0, for consistency.
So what about
audit_put_watch()andaudit_get_watch()which are set to
{}? (And all ofinclude/linux/audit.hthat uses the latter...) Does
this only matter if they are the only action called in an if or loop?I missed those, thanks for pointing it out. I sent a v2 patch now.
Ok, cool, that looks more consistent. Can you answer my question about include/linux/audit.h and exactly what conditions require "do { } while (0)" over "{ }"?
Quoted 1 line
Arnd
- RGB
--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635
--
Linux-audit mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/linux-audit
Quoted 10 lines · Richard Guy Briggs
Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Richard Guy Briggs
Quoted 2 lines
Change the macros to use the usual "do { } while (0)" instead, and change a few more that were (void)0, for consistency.
So what about
audit_put_watch()andaudit_get_watch()which are set to
{}? (And all ofinclude/linux/audit.hthat uses the latter...) Does
this only matter if they are the only action called in an if or loop?
Quoted 5 lines
Quoted 1 line
I missed those, thanks for pointing it out. I sent a v2 patch now.
Ok, cool, that looks more consistent. Can you answer my question about
include/linux/audit.hand exactly what conditions require "do { } while (0)" over "{ }"?
This is the usual way of constructing a C expression that can be used e.g. in
if (x)
foo();
else
bar();If foo() is defined as '{}', this causes a syntax error.
Arnd