Commit 8a2336e5 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

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: ddbb4114 ("KEYS: Add KEYCTL_DH_COMPUTE command")
Signed-off-by: default avatarRandy Dunlap <>
Reviewed-by: default avatarAndrew Morton <>
Cc: David Howells <>
Cc: James Morris <>
Cc: "Serge E. Hallyn" <>
Cc: Mat Martineau <>
Cc: <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 4e8346d0
......@@ -65,7 +65,7 @@
/* keyctl structures */
struct keyctl_dh_params {
__s32 private;
__s32 dh_private;
__s32 prime;
__s32 base;
......@@ -300,7 +300,7 @@ long __keyctl_dh_compute(struct keyctl_dh_params __user *params,
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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment