diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-06 01:29:00 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-06 01:29:00 +0200 |
| commit | 0250abcd726b4eba8a6175f09656fe544ed6491a (patch) | |
| tree | 43ded3d5f9b8b5684879c61ff6d03effdb7ea7c0 /security/keys/compat.c | |
| parent | Yama: use atomic allocations when reporting (diff) | |
| parent | Merge branch 'keys-trust' into keys-next (diff) | |
| download | linux-0250abcd726b4eba8a6175f09656fe544ed6491a.tar.xz linux-0250abcd726b4eba8a6175f09656fe544ed6491a.zip | |
Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/compat.c')
| -rw-r--r-- | security/keys/compat.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c index 25430a3aa7f7..c8783b3b628c 100644 --- a/security/keys/compat.c +++ b/security/keys/compat.c @@ -132,6 +132,10 @@ COMPAT_SYSCALL_DEFINE5(keyctl, u32, option, case KEYCTL_GET_PERSISTENT: return keyctl_get_persistent(arg2, arg3); + case KEYCTL_DH_COMPUTE: + return keyctl_dh_compute(compat_ptr(arg2), compat_ptr(arg3), + arg4); + default: return -EOPNOTSUPP; } |