uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name
Subsystems (3)
PATCH 12/17 uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name
From: Randy Dunlap <[email protected]>
Subject: uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name
Since this header is in "include/uapi/linux/", apparently people want to use it in userspace programs -- even in C++ ones. However, the header uses a C++ reserved keyword ("private"), so change that to "dh_private" instead to allow the header file to be used in C++ userspace.
Fixes https://bugzilla.kernel.org/show_bug.cgi?id=191051
Fixes ddbb41148724 ("KEYS: Add KEYCTL_DH_COMPUTE command")
Signed-off-by Randy Dunlap <[email protected]>
Reviewed-by Andrew Morton <[email protected]>
Cc David Howells <[email protected]>
Cc James Morris <[email protected]>
Cc "Serge E. Hallyn" <[email protected]>
Cc Mat Martineau <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/uapi/linux/keyctl.h | 2 +- security/keys/dh.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/keyctl.h renamed from include/uapi/linux/keyctl.h~uapi-linux-keyctlh-dont-use-c-reserved-keyword-as-a-struct-member-name +1 -1
@@ -65,7 +65,7 @@/* keyctl structures */ struct keyctl_dh_params { -__s32 private; +__s32 dh_private;__s32 prime;__s32 base; };
security/keys/dh.c renamed from security/keys/dh.c~uapi-linux-keyctlh-dont-use-c-reserved-keyword-as-a-struct-member-name +1 -1
@@ -300,7 +300,7 @@ long __keyctl_dh_compute(struct keyctl_d } dh_inputs.g_size = dlen; - dlen =dh_data_from_key (pcopy.private, &dh_inputs.key); + dlen =dh_data_from_key (pcopy.dh_private, &dh_inputs.key);if (dlen <0 ) { ret = dlen; goto out2;
_