diff options
| author | James Morris | 2014-04-14 03:42:49 +0200 |
|---|---|---|
| committer | James Morris | 2014-04-14 03:42:49 +0200 |
| commit | b13cebe70775e67323e1c2eff20e1cd174e430a4 (patch) | |
| tree | 80e5775c2ce5c90bdef8a2ce487fb70a179217af /include/linux/security.h | |
| parent | Merge commit 'v3.14' into next (diff) | |
| parent | smack: fix key permission verification (diff) | |
| download | kernel-qcow2-linux-b13cebe70775e67323e1c2eff20e1cd174e430a4.tar.gz kernel-qcow2-linux-b13cebe70775e67323e1c2eff20e1cd174e430a4.tar.xz kernel-qcow2-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 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 2fc42d191f79..6726006bc766 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1708,7 +1708,7 @@ struct security_operations { void (*key_free) (struct key *key); int (*key_permission) (key_ref_t key_ref, const struct cred *cred, - key_perm_t perm); + unsigned perm); int (*key_getsecurity)(struct key *key, char **_buffer); #endif /* CONFIG_KEYS */ @@ -3030,7 +3030,7 @@ static inline int security_path_chroot(struct path *path) int security_key_alloc(struct key *key, const struct cred *cred, unsigned long flags); 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); int security_key_getsecurity(struct key *key, char **_buffer); #else @@ -3048,7 +3048,7 @@ static inline void security_key_free(struct key *key) static inline int security_key_permission(key_ref_t key_ref, const struct cred *cred, - key_perm_t perm) + unsigned perm) { return 0; } |