Re: [PATCH] Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"
On Mon, 2018-09-24 at 13:00 +0100, David Howells wrote:
> Lubomir Rintel wrote:
>
> > This changes UAPI, breaking iwd and libell:
> >
> > ell/key.c: In function 'kernel_dh_compute':
> > ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member
> > named 'private'; did you mean 'dh_private'?
> > struct keyctl_dh_params params = { .private = private,
> > ^~~
> > dh_private
> >
> > This reverts commit 8a2336e549d385bb0b46880435b411df8d8200e8.
> >
> > Cc: David Howells
> > Cc: James Morris
> > Cc: "Serge E. Hallyn"
> > Cc: Mat Martineau
> > Cc: Andrew Morton
> > Cc: Linus Torvalds
> > Cc:
>
> Can I stick your Signed-off-by on it?
1. Yes, please do.
Signed-off-by: Lubomir Rintel
>
> David
Re: [PATCH] Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"
On Mon, 2018-09-24 at 13:00 +0100, David Howells wrote:
> Lubomir Rintel wrote:
>
> > This changes UAPI, breaking iwd and libell:
> >
> > ell/key.c: In function 'kernel_dh_compute':
> > ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member
> > named 'private'; did you mean 'dh_private'?
> > struct keyctl_dh_params params = { .private = private,
> > ^~~
> > dh_private
> >
> > This reverts commit 8a2336e549d385bb0b46880435b411df8d8200e8.
> >
> > Cc: David Howells
> > Cc: James Morris
> > Cc: "Serge E. Hallyn"
> > Cc: Mat Martineau
> > Cc: Andrew Morton
> > Cc: Linus Torvalds
> > Cc:
>
> Can I stick your Signed-off-by on it?
1. Yes, please do.
Signed-off-by: Lubomir Rintel
>
> David
Re: [PATCH] Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"
Lubomir Rintel wrote:
> This changes UAPI, breaking iwd and libell:
>
> ell/key.c: In function 'kernel_dh_compute':
> ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member named
> 'private'; did you mean 'dh_private'?
> struct keyctl_dh_params params = { .private = private,
> ^~~
> dh_private
>
> This reverts commit 8a2336e549d385bb0b46880435b411df8d8200e8.
>
> Cc: David Howells
> Cc: James Morris
> Cc: "Serge E. Hallyn"
> Cc: Mat Martineau
> Cc: Andrew Morton
> Cc: Linus Torvalds
> Cc:
Can I stick your Signed-off-by on it?
David
Re: [PATCH] Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"
Lubomir Rintel wrote:
> This changes UAPI, breaking iwd and libell:
>
> ell/key.c: In function 'kernel_dh_compute':
> ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member named
> 'private'; did you mean 'dh_private'?
> struct keyctl_dh_params params = { .private = private,
> ^~~
> dh_private
>
> This reverts commit 8a2336e549d385bb0b46880435b411df8d8200e8.
>
> Cc: David Howells
> Cc: James Morris
> Cc: "Serge E. Hallyn"
> Cc: Mat Martineau
> Cc: Andrew Morton
> Cc: Linus Torvalds
> Cc:
Can I stick your Signed-off-by on it?
David
[PATCH] Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"
This changes UAPI, breaking iwd and libell:
ell/key.c: In function 'kernel_dh_compute':
ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member named
'private'; did you mean 'dh_private'?
struct keyctl_dh_params params = { .private = private,
^~~
dh_private
This reverts commit 8a2336e549d385bb0b46880435b411df8d8200e8.
Cc: David Howells
Cc: James Morris
Cc: "Serge E. Hallyn"
Cc: Mat Martineau
Cc: Andrew Morton
Cc: Linus Torvalds
Cc:
---
include/uapi/linux/keyctl.h | 2 +-
security/keys/dh.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h
index 910cc4334b21..7b8c9e19bad1 100644
--- a/include/uapi/linux/keyctl.h
+++ b/include/uapi/linux/keyctl.h
@@ -65,7 +65,7 @@
/* keyctl structures */
struct keyctl_dh_params {
- __s32 dh_private;
+ __s32 private;
__s32 prime;
__s32 base;
};
diff --git a/security/keys/dh.c b/security/keys/dh.c
index 3b602a1e27fa..711e89d8c415 100644
--- a/security/keys/dh.c
+++ b/security/keys/dh.c
@@ -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.dh_private, _inputs.key);
+ dlen = dh_data_from_key(pcopy.private, _inputs.key);
if (dlen < 0) {
ret = dlen;
goto out2;
--
2.19.0
[PATCH] Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"
This changes UAPI, breaking iwd and libell:
ell/key.c: In function 'kernel_dh_compute':
ell/key.c:205:38: error: 'struct keyctl_dh_params' has no member named
'private'; did you mean 'dh_private'?
struct keyctl_dh_params params = { .private = private,
^~~
dh_private
This reverts commit 8a2336e549d385bb0b46880435b411df8d8200e8.
Cc: David Howells
Cc: James Morris
Cc: "Serge E. Hallyn"
Cc: Mat Martineau
Cc: Andrew Morton
Cc: Linus Torvalds
Cc:
---
include/uapi/linux/keyctl.h | 2 +-
security/keys/dh.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h
index 910cc4334b21..7b8c9e19bad1 100644
--- a/include/uapi/linux/keyctl.h
+++ b/include/uapi/linux/keyctl.h
@@ -65,7 +65,7 @@
/* keyctl structures */
struct keyctl_dh_params {
- __s32 dh_private;
+ __s32 private;
__s32 prime;
__s32 base;
};
diff --git a/security/keys/dh.c b/security/keys/dh.c
index 3b602a1e27fa..711e89d8c415 100644
--- a/security/keys/dh.c
+++ b/security/keys/dh.c
@@ -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.dh_private, _inputs.key);
+ dlen = dh_data_from_key(pcopy.private, _inputs.key);
if (dlen < 0) {
ret = dlen;
goto out2;
--
2.19.0
