diff options
author | Dave Airlie <airlied@redhat.com> | 2018-10-04 04:03:34 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-10-04 04:03:34 +0300 |
commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /security | |
parent | 612c6bd5e3f8b67505316805dc15369598f6ff57 (diff) | |
parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
download | linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.xz |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/keys/dh.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, &dh_inputs.key); + dlen = dh_data_from_key(pcopy.private, &dh_inputs.key); if (dlen < 0) { ret = dlen; goto out2; |