diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-04-14 03:42:49 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-04-14 03:42:49 +0200 |
| commit | b13cebe70775e67323e1c2eff20e1cd174e430a4 (patch) | |
| tree | 80e5775c2ce5c90bdef8a2ce487fb70a179217af /security/capability.c | |
| parent | Merge commit 'v3.14' into next (diff) | |
| parent | smack: fix key permission verification (diff) | |
| download | linux-b13cebe70775e67323e1c2eff20e1cd174e430a4.tar.xz linux-b13cebe70775e67323e1c2eff20e1cd174e430a4.zip | |
Merge tag 'keys-20140314' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c index ad0d4de69944..e76373de3129 100644 --- a/security/capability.c +++ b/security/capability.c @@ -879,7 +879,7 @@ static void cap_key_free(struct key *key) } static int cap_key_permission(key_ref_t key_ref, const struct cred *cred, - key_perm_t perm) + unsigned perm) { return 0; } |