imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-30 05:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"

Browse Source 
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 8a2336e549.

Fixes: 8a2336e549 ("uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name")
Signed-off-by: Lubomir Rintel <[email protected]>
Signed-off-by: David Howells <[email protected]>
cc: Randy Dunlap <[email protected]>
cc: Mat Martineau <[email protected]>
cc: Stephan Mueller <[email protected]>
cc: James Morris <[email protected]>
cc: "Serge E. Hallyn" <[email protected]>
cc: Mat Martineau <[email protected]>
cc: Andrew Morton <[email protected]>
cc: Linus Torvalds <[email protected]>
cc: <[email protected]>
Signed-off-by: James Morris <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Lubomir Rintel authored and Greg Kroah-Hartman committed 2018-09-25 13:28:58 +02:00
1 parent 2dd68cc7fd
commit 8c0f9f5b30
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/uapi/linux/keyctl.h
+1 -1
View File
@@ -65,7 +65,7 @@
/* keyctl structures */
struct keyctl_dh_params {
__s32 dh_private;
__s32 private;
__s32 prime;
__s32 base;
};
security/keys/dh.c
+1 -1
View File
@@ -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, &dh_inputs.key);
dlen = dh_data_from_key(pcopy.private, &dh_inputs.key);
if (dlen < 0) {
ret = dlen;
goto out2;