diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 11:46:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 11:46:08 -0800 |
| commit | afd290945cd283030b51b433a66fe57a8feb28c8 (patch) | |
| tree | a389cb472d0ca242e02e86becd4a1967dfb0624b /include/linux/key.h | |
| parent | uml: fix compile for x86-64 (diff) | |
| parent | KEYS: Permit key_serial() to be called with a const key pointer (diff) | |
| download | wireguard-linux-afd290945cd283030b51b433a66fe57a8feb28c8.tar.xz wireguard-linux-afd290945cd283030b51b433a66fe57a8feb28c8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Permit key_serial() to be called with a const key pointer
keys: fix user_defined key sparse messages
ima: fix cred sparse warning
MPILIB: Add a missing ENOMEM check
Diffstat (limited to 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index bfc014c57351..5253471cd2ea 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -271,7 +271,7 @@ extern int keyring_add_key(struct key *keyring, extern struct key *key_lookup(key_serial_t id); -static inline key_serial_t key_serial(struct key *key) +static inline key_serial_t key_serial(const struct key *key) { return key ? key->serial : 0; } |