diff options
| author | Linus Torvalds | 2020-01-14 09:56:31 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-01-14 09:56:31 -0800 |
| commit | e033e7d4a8081852b2cca53e530e2c0f4e6769c0 (patch) | |
| tree | a396fbd9164da534f3b45e8ca95d942c5da78099 /kernel | |
| parent | 3f1f9a9b715cfa5d9933a024807e32b206775f83 (diff) | |
| parent | f52b83b0b1c40ada38df917973ab719a4a753951 (diff) | |
Merge branch 'dhowells' (patches from DavidH)
Merge misc fixes from David Howells.
Two afs fixes and a key refcounting fix.
* dhowells:
afs: Fix afs_lookup() to not clobber the version on a new dentry
afs: Fix use-after-loss-of-ref
keys: Fix request_key() cache
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cred.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 9ed51b70ed80..809a985b1793 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -175,8 +175,8 @@ void exit_creds(struct task_struct *tsk) put_cred(cred); #ifdef CONFIG_KEYS_REQUEST_CACHE - key_put(current->cached_requested_key); - current->cached_requested_key = NULL; + key_put(tsk->cached_requested_key); + tsk->cached_requested_key = NULL; #endif } |