David Howells 2ecefa0a15 keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h ... The keyctl_dh_params struct in uapi/linux/keyctl.h contains the symbol "private" which means that the header file will cause compilation failure if #included in to a C++ program. Further, the patch that added the same struct to the keyutils package named the symbol "priv", not "private". The previous attempt to fix this (commit 8a2336e549) did so by simply renaming the kernel's copy of the field to dh_private, but this then breaks existing userspace and as such has been reverted (commit 8c0f9f5b30). [And note, to those who think that wrapping the struct in extern "C" {} will work: it won't; that only changes how symbol names are presented to the assembler and linker.]. Instead, insert an anonymous union around the "private" member and add a second member in there with the name "priv" to match the one in the keyutils package. The "private" member is then wrapped in !__cplusplus cpp-conditionals to hide it from C++. Fixes: ddbb411487 ("KEYS: Add KEYCTL_DH_COMPUTE command") Fixes: 8a2336e549 ("uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name") Signed-off-by: David Howells <dhowells@redhat.com> cc: Randy Dunlap <rdunlap@infradead.org> cc: Lubomir Rintel <lkundrak@v3.sk> cc: James Morris <jmorris@namei.org> cc: Mat Martineau <mathew.j.martineau@linux.intel.com> cc: Stephan Mueller <smueller@chronox.de> cc: Andrew Morton <akpm@linux-foundation.org> cc: Linus Torvalds <torvalds@linux-foundation.org> cc: stable@vger.kernel.org Signed-off-by: James Morris <james.morris@microsoft.com>		2018-09-28 09:51:51 -07:00
..
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-08-15 15:04:25 -07:00
drm	drm: add msm compressed format modifiers	2018-07-26 10:39:21 -04:00
linux	keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h	2018-09-28 09:51:51 -07:00
misc	ocxl: Add an IOCTL so userspace knows what OCXL features are available	2018-06-03 20:40:32 +10:00
mtd	ubi: expose the volume CRC check skip flag	2018-08-15 00:25:21 +02:00
rdma	qedr: Add user space support for SRQ	2018-08-14 16:31:54 -06:00
scsi
sound	ASoC: Updates for v4.18	2018-06-05 16:51:55 +02:00
video
xen	xen/gntdev: Add initial support for dma-buf UAPI	2018-07-26 23:05:14 -04:00