Skip to content

Commit

Permalink
uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct membe…
Browse files Browse the repository at this point in the history
…r 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
Link: http://lkml.kernel.org/r/[email protected]
Fixes: ddbb411 ("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]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rddunlap authored and torvalds committed Sep 4, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 4e8346d commit 8a2336e
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/uapi/linux/keyctl.h
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@

/* keyctl structures */
struct keyctl_dh_params {
__s32 private;
__s32 dh_private;
__s32 prime;
__s32 base;
};
2 changes: 1 addition & 1 deletion security/keys/dh.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 8a2336e

Please sign in to comment.