From: esyr@redhat.com (Eugene Syromiatnikov)
To: linux-security-module@vger.kernel.org
Subject: [PATCH resend] uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name
Date: Mon, 10 Sep 2018 00:00:18 +0200 [thread overview]
Message-ID: <20180909220018.GH13219@asgard.redhat.com> (raw)
In-Reply-To: <0db6c314-1ef4-9bfa-1baa-7214dd2ee061@infradead.org>
On Tue, Aug 28, 2018 at 04:34:04PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> 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.
This change breaks all existing C programs that rely on <linux/keyctl.h>
uapi header in order to get struct keyctl_dh_params definition, however.
>
> Fixes https://bugzilla.kernel.org/show_bug.cgi?id=191051
> Fixes: ddbb41148724 ("KEYS: Add KEYCTL_DH_COMPUTE command")
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: James Morris <jmorris@namei.org>
> Cc: "Serge E. Hallyn" <serge@hallyn.com>
> Cc: keyrings at vger.kernel.org
> Cc: linux-security-module at vger.kernel.org
> Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
> Cc: stable at vger.kernel.org
> ---
> include/uapi/linux/keyctl.h | 2 +-
> security/keys/dh.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- lnx-416.orig/include/uapi/linux/keyctl.h
> +++ lnx-416/include/uapi/linux/keyctl.h
> @@ -65,7 +65,7 @@
>
> /* keyctl structures */
> struct keyctl_dh_params {
> - __s32 private;
> + __s32 dh_private;
> __s32 prime;
> __s32 base;
> };
> --- lnx-416.orig/security/keys/dh.c
> +++ lnx-416/security/keys/dh.c
> @@ -307,7 +307,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;
>
>
next prev parent reply other threads:[~2018-09-09 22:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 23:34 [PATCH resend] uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name Randy Dunlap
2018-08-29 2:42 ` Greg KH
2018-08-29 22:56 ` Andrew Morton
2018-09-09 22:00 ` Eugene Syromiatnikov [this message]
2018-09-10 22:09 ` Andrew Morton
2018-09-22 0:03 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180909220018.GH13219@asgard.redhat.com \
--to=esyr@redhat.com \
--cc=linux-security-module@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).