* [PATCH] selinux: avoid extra semicolon
@ 2022-05-02 14:10 Christian Göttsche
2022-05-03 18:08 ` Paul Moore
0 siblings, 1 reply; 2+ messages in thread
From: Christian Göttsche @ 2022-05-02 14:10 UTC (permalink / raw)
To: selinux
Cc: Paul Moore, Stephen Smalley, Eric Paris, Nathan Chancellor,
Nick Desaulniers, Ondrej Mosnacek, linux-kernel, llvm
Wrap macro into `do { } while (0)` to avoid Clang emitting warnings
about extra semicolons.
Similar to userspace commit
https://github.com/SELinuxProject/selinux/commit/9d85aa60d12e468e7fd510c2b5475b5299b71622
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
security/selinux/ss/avtab.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
index cfdae20792e1..6178af5fedbe 100644
--- a/security/selinux/ss/avtab.c
+++ b/security/selinux/ss/avtab.c
@@ -40,7 +40,7 @@ static inline int avtab_hash(const struct avtab_key *keyp, u32 mask)
u32 hash = 0;
-#define mix(input) { \
+#define mix(input) do { \
u32 v = input; \
v *= c1; \
v = (v << r1) | (v >> (32 - r1)); \
@@ -48,7 +48,7 @@ static inline int avtab_hash(const struct avtab_key *keyp, u32 mask)
hash ^= v; \
hash = (hash << r2) | (hash >> (32 - r2)); \
hash = hash * m + n; \
-}
+} while (0)
mix(keyp->target_class);
mix(keyp->target_type);
--
2.36.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] selinux: avoid extra semicolon
2022-05-02 14:10 [PATCH] selinux: avoid extra semicolon Christian Göttsche
@ 2022-05-03 18:08 ` Paul Moore
0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2022-05-03 18:08 UTC (permalink / raw)
To: Christian Göttsche
Cc: selinux, Stephen Smalley, Eric Paris, Nathan Chancellor,
Nick Desaulniers, Ondrej Mosnacek, linux-kernel, llvm
On Mon, May 2, 2022 at 10:10 AM Christian Göttsche
<cgzones@googlemail.com> wrote:
>
> Wrap macro into `do { } while (0)` to avoid Clang emitting warnings
> about extra semicolons.
> Similar to userspace commit
> https://github.com/SELinuxProject/selinux/commit/9d85aa60d12e468e7fd510c2b5475b5299b71622
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
> ---
> security/selinux/ss/avtab.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Merged into selinux/next with some whitespace tweaks.
--
paul-moore.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-03 18:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-02 14:10 [PATCH] selinux: avoid extra semicolon Christian Göttsche
2022-05-03 18:08 ` Paul Moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®