Commit 5eb30790 authored Oct 17, 2006 by Dave Kleikamp Committed by Linus Torvalds Oct 17, 2006

[PATCH] null dereference in fs/jbd2/journal.c



This is Eric Sesterhenn's jbd patch applied to jbd2.
Commit: 41716c7c

His words:

Since commit d1807793 we dereference a NULL
pointer.  Coverity id #1432.  We set journal to NULL, and use it directly
afterwards.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 3f4a0b91

fs/jbd2/journal.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -725,6 +725,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
		__FUNCTION__);
		kfree(journal);
		journal = NULL;
		goto out;
		}
		journal->j_dev = bdev;
		journal->j_fs_dev = fs_dev;
		@@ -735,7 +736,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
		J_ASSERT(bh != NULL);
		journal->j_sb_buffer = bh;
		journal->j_superblock = (journal_superblock_t *)bh->b_data;

		out:
		return journal;
		}

Admin message