linux-kernel - [PATCH 02/11] UAPI: keys: Fix use of C++ keywords as structural members

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <153616288762.23468.17409226604948361939.stgit@warthog.procyon.org.uk>
Date:   Wed, 05 Sep 2018 16:54:47 +0100
From:   David Howells <dhowells@...hat.com>
To:     linux-api@...r.kernel.org, linux-kbuild@...r.kernel.org
Cc:     Mat Martineau <mathew.j.martineau@...ux.intel.com>,
        keyrings@...r.kernel.org, linux-kernel@...r.kernel.org,
        dhowells@...hat.com
Subject: [PATCH 02/11] UAPI: keys: Fix use of C++ keywords as structural
 members

The keyctl_dh_params struct uses a C++ keyword as structural members.  Fix
this by inserting an anonymous union that provides an alternative name and
then hide the reserved name in C++.

Signed-off-by: David Howells <dhowells@...hat.com>
cc: Mat Martineau <mathew.j.martineau@...ux.intel.com>
cc: keyrings@...r.kernel.org
---

 include/uapi/linux/keyctl.h |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h
index 7b8c9e19bad1..170f015d1f25 100644
--- a/include/uapi/linux/keyctl.h
+++ b/include/uapi/linux/keyctl.h
@@ -65,7 +65,12 @@
 
 /* keyctl structures */
 struct keyctl_dh_params {
-	__s32 private;
+	union {
+#ifndef __cplusplus
+		__s32 private;
+#endif
+		__s32 dh_private;
+	};
 	__s32 prime;
 	__s32 base;
 };