lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <200807252256.m6PMuPBl003086@imap1.linux-foundation.org> Date: Fri, 25 Jul 2008 15:56:25 -0700 From: akpm@...ux-foundation.org To: duaneg@...da.com, linux-ext4@...r.kernel.org, mm-commits@...r.kernel.org Subject: - jbd-replace-potentially-false-assertion-with-if-block.patch removed from -mm tree The patch titled jbd: replace potentially false assertion with if block has been removed from the -mm tree. Its filename was jbd-replace-potentially-false-assertion-with-if-block.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: jbd: replace potentially false assertion with if block From: "Duane Griffin" <duaneg@...da.com> If an error occurs during jbd cache initialisation it is possible for the journal_head_cache to be NULL when journal_destroy_journal_head_cache is called. Replace the J_ASSERT with an if block to handle the situation correctly. Note that even with this fix things will break badly if jbd is statically compiled in and cache initialisation fails. Signed-off-by: Duane Griffin <duaneg@...da.com Cc: <linux-ext4@...r.kernel.org> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org> --- fs/jbd/journal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN fs/jbd/journal.c~jbd-replace-potentially-false-assertion-with-if-block fs/jbd/journal.c --- a/fs/jbd/journal.c~jbd-replace-potentially-false-assertion-with-if-block +++ a/fs/jbd/journal.c @@ -1636,9 +1636,10 @@ static int journal_init_journal_head_cac static void journal_destroy_journal_head_cache(void) { - J_ASSERT(journal_head_cache != NULL); - kmem_cache_destroy(journal_head_cache); - journal_head_cache = NULL; + if (journal_head_cache) { + kmem_cache_destroy(journal_head_cache); + journal_head_cache = NULL; + } } /* _ Patches currently in -mm which might be from duaneg@...da.com are origin.patch -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists