linux-ext4 - - jbd2-correctly-unescape-journal-data-blocks.patch removed from -mm tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <200803212029.m2LKTZRP008884@imap1.linux-foundation.org>
Date:	Fri, 21 Mar 2008 13:29:35 -0700
From:	akpm@...ux-foundation.org
To:	duaneg@...da.com, jack@...e.cz, linux-ext4@...r.kernel.org,
	stable@...nel.org, mm-commits@...r.kernel.org
Subject: - jbd2-correctly-unescape-journal-data-blocks.patch removed from -mm tree


The patch titled
     jbd2: correctly unescape journal data blocks
has been removed from the -mm tree.  Its filename was
     jbd2-correctly-unescape-journal-data-blocks.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: jbd2: correctly unescape journal data blocks
From: "Duane Griffin" <duaneg@...da.com>

Fix a long-standing typo (predating git) that will cause data corruption if a
journal data block needs unescaping.  At the moment the wrong buffer head's
data is being unescaped.

To test this case mount a filesystem with data=journal, start creating and
deleting a bunch of files containing only JBD2_MAGIC_NUMBER (0xc03b3998), then
pull the plug on the device.  Without this patch the files will contain zeros
instead of the correct data after recovery.

Signed-off-by: Duane Griffin <duaneg@...da.com>
Acked-by: Jan Kara <jack@...e.cz>
Cc: <linux-ext4@...r.kernel.org>
Cc: <stable@...nel.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---

 fs/jbd2/recovery.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/jbd2/recovery.c~jbd2-correctly-unescape-journal-data-blocks fs/jbd2/recovery.c
--- a/fs/jbd2/recovery.c~jbd2-correctly-unescape-journal-data-blocks
+++ a/fs/jbd2/recovery.c
@@ -535,7 +535,7 @@ static int do_one_pass(journal_t *journa
 					memcpy(nbh->b_data, obh->b_data,
 							journal->j_blocksize);
 					if (flags & JBD2_FLAG_ESCAPE) {
-						*((__be32 *)bh->b_data) =
+						*((__be32 *)nbh->b_data) =
 						cpu_to_be32(JBD2_MAGIC_NUMBER);
 					}
 
_

Patches currently in -mm which might be from duaneg@...da.com are

origin.patch
jbd2-only-create-debugfs-and-stats-entries-if-cache-initialisation-is-successful.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