diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
| commit | a4eb8b993554d374002663200bf5721f7f2ee259 (patch) | |
| tree | e8934fdf72b4b09db9f514ae82bc81d03959b942 /security/keys/gc.c | |
| parent | x86/boot/64: Put __startup_64() into .head.text (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.xz linux-a4eb8b993554d374002663200bf5721f7f2ee259.zip | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/keys/gc.c')
| -rw-r--r-- | security/keys/gc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/security/keys/gc.c b/security/keys/gc.c index 595becc6d0d2..87cb260e4890 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c @@ -158,9 +158,7 @@ static noinline void key_gc_unused_keys(struct list_head *keys) kfree(key->description); -#ifdef KEY_DEBUGGING - key->magic = KEY_DEBUG_MAGIC_X; -#endif + memzero_explicit(key, sizeof(*key)); kmem_cache_free(key_jar, key); } } |