diff options
Diffstat (limited to 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index cef3b315ba7c..2393b1c040b6 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/atomic.h> | 24 | #include <linux/atomic.h> |
| 25 | 25 | ||
| 26 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
| 27 | #include <linux/uidgid.h> | ||
| 27 | 28 | ||
| 28 | /* key handle serial number */ | 29 | /* key handle serial number */ |
| 29 | typedef int32_t key_serial_t; | 30 | typedef int32_t key_serial_t; |
| @@ -137,8 +138,8 @@ struct key { | |||
| 137 | time_t revoked_at; /* time at which key was revoked */ | 138 | time_t revoked_at; /* time at which key was revoked */ |
| 138 | }; | 139 | }; |
| 139 | time_t last_used_at; /* last time used for LRU keyring discard */ | 140 | time_t last_used_at; /* last time used for LRU keyring discard */ |
| 140 | uid_t uid; | 141 | kuid_t uid; |
| 141 | gid_t gid; | 142 | kgid_t gid; |
| 142 | key_perm_t perm; /* access permissions */ | 143 | key_perm_t perm; /* access permissions */ |
| 143 | unsigned short quotalen; /* length added to quota */ | 144 | unsigned short quotalen; /* length added to quota */ |
| 144 | unsigned short datalen; /* payload data length | 145 | unsigned short datalen; /* payload data length |
| @@ -193,7 +194,7 @@ struct key { | |||
| 193 | 194 | ||
| 194 | extern struct key *key_alloc(struct key_type *type, | 195 | extern struct key *key_alloc(struct key_type *type, |
| 195 | const char *desc, | 196 | const char *desc, |
| 196 | uid_t uid, gid_t gid, | 197 | kuid_t uid, kgid_t gid, |
| 197 | const struct cred *cred, | 198 | const struct cred *cred, |
| 198 | key_perm_t perm, | 199 | key_perm_t perm, |
| 199 | unsigned long flags); | 200 | unsigned long flags); |
| @@ -262,7 +263,7 @@ extern int key_link(struct key *keyring, | |||
| 262 | extern int key_unlink(struct key *keyring, | 263 | extern int key_unlink(struct key *keyring, |
| 263 | struct key *key); | 264 | struct key *key); |
| 264 | 265 | ||
| 265 | extern struct key *keyring_alloc(const char *description, uid_t uid, gid_t gid, | 266 | extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid, |
| 266 | const struct cred *cred, | 267 | const struct cred *cred, |
| 267 | unsigned long flags, | 268 | unsigned long flags, |
| 268 | struct key *dest); | 269 | struct key *dest); |
