Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Link: http://lkml.kernel.org/r/0db6c314-1ef4-9bfa-1baa-7214dd2ee061@infradead.org


Fixes: ddbb4114 ("KEYS: Add KEYCTL_DH_COMPUTE command")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4e8346d0

include/uapi/linux/keyctl.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 


/* keyctl structures */

struct keyctl_dh_params {

	__s32 private;

	__s32 dh_private;

	__s32 prime;

	__s32 base;

};

security/keys/dh.c

+1 −1
Original line number Diff line number Diff line
@@ -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;