diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-04-14 11:42:49 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-04-14 11:42:49 +1000 |
| commit | b13cebe70775e67323e1c2eff20e1cd174e430a4 (patch) | |
| tree | 80e5775c2ce5c90bdef8a2ce487fb70a179217af /security/security.c | |
| parent | Merge commit 'v3.14' into next (diff) | |
| parent | smack: fix key permission verification (diff) | |
| download | linux-dev-b13cebe70775e67323e1c2eff20e1cd174e430a4.tar.xz linux-dev-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/security.c')
| -rw-r--r-- | security/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index 919cad93ac82..d91fec458e90 100644 --- a/security/security.c +++ b/security/security.c @@ -1407,7 +1407,7 @@ void security_key_free(struct key *key) } int security_key_permission(key_ref_t key_ref, - const struct cred *cred, key_perm_t perm) + const struct cred *cred, unsigned perm) { return security_ops->key_permission(key_ref, cred, perm); } |