diff options
| author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2011-02-04 13:13:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-04 13:40:29 -0500 |
| commit | 78d2978874e4e10e97dfd4fd79db45bdc0748550 (patch) | |
| tree | 5a07ba8b01c52632638a1724a5dcbf6d0606da73 | |
| parent | bb5b583b52794efc7b59f70a78be1b66a98dd939 (diff) | |
CRED: Fix kernel panic upon security_file_alloc() failure.
In get_empty_filp() since 2.6.29, file_free(f) is called with f->f_cred == NULL
when security_file_alloc() returned an error. As a result, kernel will panic()
due to put_cred(NULL) call within RCU callback.
Fix this bug by assigning f->f_cred before calling security_file_alloc().
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/file_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index c3e89adf53c..eb36b6b17e2 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -125,13 +125,13 @@ struct file *get_empty_filp(void) | |||
| 125 | goto fail; | 125 | goto fail; |
| 126 | 126 | ||
| 127 | percpu_counter_inc(&nr_files); | 127 | percpu_counter_inc(&nr_files); |
| 128 | f->f_cred = get_cred(cred); | ||
| 128 | if (security_file_alloc(f)) | 129 | if (security_file_alloc(f)) |
| 129 | goto fail_sec; | 130 | goto fail_sec; |
| 130 | 131 | ||
| 131 | INIT_LIST_HEAD(&f->f_u.fu_list); | 132 | INIT_LIST_HEAD(&f->f_u.fu_list); |
| 132 | atomic_long_set(&f->f_count, 1); | 133 | atomic_long_set(&f->f_count, 1); |
| 133 | rwlock_init(&f->f_owner.lock); | 134 | rwlock_init(&f->f_owner.lock); |
| 134 | f->f_cred = get_cred(cred); | ||
| 135 | spin_lock_init(&f->f_lock); | 135 | spin_lock_init(&f->f_lock); |
| 136 | eventpoll_init_file(f); | 136 | eventpoll_init_file(f); |
| 137 | /* f->f_version: 0 */ | 137 | /* f->f_version: 0 */ |
