summaryrefslogtreecommitdiff
path: root/fs/jbd2/transaction.c
diff options
context:
space:
mode:
authorChengguang Xu <cgxu519@gmail.com>2019-05-11 04:15:47 +0300
committerTheodore Ts'o <tytso@mit.edu>2019-05-11 04:15:47 +0300
commit0d52154bb0a700abb459a2cbce0a30fc2549b67e (patch)
tree77f16584704ea8a684a8f0bd70bc76bfd557e9a9 /fs/jbd2/transaction.c
parent592acbf16821288ecdc4192c47e3774a4c48bb64 (diff)
downloadlinux-0d52154bb0a700abb459a2cbce0a30fc2549b67e.tar.xz
jbd2: fix potential double free
When failing from creating cache jbd2_inode_cache, we will destroy the previously created cache jbd2_handle_cache twice. This patch fixes this by moving each cache initialization/destruction to its own separate, individual function. Signed-off-by: Chengguang Xu <cgxu519@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org
Diffstat (limited to 'fs/jbd2/transaction.c')
-rw-r--r--fs/jbd2/transaction.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index f940d31c2adc..8ca4fddc705f 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -42,9 +42,11 @@ int __init jbd2_journal_init_transaction_cache(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY,
NULL);
- if (transaction_cache)
- return 0;
- return -ENOMEM;
+ if (!transaction_cache) {
+ pr_emerg("JBD2: failed to create transaction cache\n");
+ return -ENOMEM;
+ }
+ return 0;
}
void jbd2_journal_destroy_transaction_cache(void)