diff options
| author |   Elena Reshetova <elena.reshetova@intel.com> | 2017-03-31 15:20:48 +0300 |
|---|---|---|
| committer |   James Morris <james.l.morris@oracle.com> | 2017-04-03 10:49:05 +1000 |
| commit | fff292914d3a2f1efd05ca71c2ba72a3c663201e (patch) | |
| tree | 627f9870ad82da8f6f06cca86a73e3b7e2fc97d5 /include/linux/key.h | |
| parent | TOMOYO: Use designated initializers (diff) | |
| download | linux-dev-fff292914d3a2f1efd05ca71c2ba72a3c663201e.tar.xz linux-dev-fff292914d3a2f1efd05ca71c2ba72a3c663201e.zip | |
security, keys: convert key.usage from atomic_t to refcount_t
refcount_t type and corresponding API should be
used instead of atomic_t when the variable is used as
a reference counter. This allows to avoid accidental
refcounter overflows that might lead to use-after-free
situations.
Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Windsor <dwindsor@gmail.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index e45212f2777e..9d9fac583dd3 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -23,6 +23,7 @@ #include <linux/rwsem.h> #include <linux/atomic.h> #include <linux/assoc_array.h> +#include <linux/refcount.h> #ifdef __KERNEL__ #include <linux/uidgid.h> @@ -135,7 +136,7 @@ static inline bool is_key_possessed(const key_ref_t key_ref) * - Kerberos TGTs and tickets */ struct key { - atomic_t usage; /* number of references */ + refcount_t usage; /* number of references */ key_serial_t serial; /* key serial number */ union { struct list_head graveyard_link; @@ -242,7 +243,7 @@ extern void key_put(struct key *key); static inline struct key *__key_get(struct key *key) { - atomic_inc(&key->usage); + refcount_inc(&key->usage); return key; } |