diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-04-13 21:42:49 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-04-13 21:42:49 -0400 |
| commit | b13cebe70775e67323e1c2eff20e1cd174e430a4 (patch) | |
| tree | 80e5775c2ce5c90bdef8a2ce487fb70a179217af /security/selinux | |
| parent | ecd740c6f2f092b90b95fa35f757973589eaaca2 (diff) | |
| parent | fffea214abf66a8672cfd6697fae65e743e22f11 (diff) | |
Merge tag 'keys-20140314' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 869c2f1e0da1..6ab22720c277 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -5719,7 +5719,7 @@ static void selinux_key_free(struct key *k) | |||
| 5719 | 5719 | ||
| 5720 | static int selinux_key_permission(key_ref_t key_ref, | 5720 | static int selinux_key_permission(key_ref_t key_ref, |
| 5721 | const struct cred *cred, | 5721 | const struct cred *cred, |
| 5722 | key_perm_t perm) | 5722 | unsigned perm) |
| 5723 | { | 5723 | { |
| 5724 | struct key *key; | 5724 | struct key *key; |
| 5725 | struct key_security_struct *ksec; | 5725 | struct key_security_struct *ksec; |