lkml.org 
[lkml]   [2006]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] Fix memory leak when the ext3's journal file is corrupted
Hi Theodore,

On Sun, May 21, 2006 at 07:08:34PM -0400, Theodore Ts'o wrote:
>
> Fix memory leak when the ext3's journal file is corrupted
>
> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
>
> Index: linux-2.6/fs/jbd/recovery.c
> ===================================================================
> --- linux-2.6.orig/fs/jbd/recovery.c 2006-05-21 18:39:27.000000000 -0400
> +++ linux-2.6/fs/jbd/recovery.c 2006-05-21 18:39:34.000000000 -0400
> @@ -531,6 +531,7 @@
> default:
> jbd_debug(3, "Unrecognised magic %d, end of scan.\n",
> blocktype);
> + brelse(bh);
> goto done;
> }
> }

It seems to me that this one is a clear candidate for 2.4 too, isn't it ?
While reviewing diffs between 2.4 and 2.6 on this file, I also found this
patch from Andrew two years ago which also seems appropriate for 2.4 :


[PATCH] JBD: avoid panic on corrupted journal superblock

Don't panic if the journal superblock is wrecked: just fail the mount.


--- 1.11/fs/jbd/recovery.c 2006-05-23 20:44:53 -07:00
+++ 1.12/fs/jbd/recovery.c 2006-05-23 20:44:53 -07:00
@@ -137,7 +137,10 @@

*bhp = NULL;

- J_ASSERT (offset < journal->j_maxlen);
+ if (offset >= journal->j_maxlen) {
+ printk(KERN_ERR "JBD: corrupted journal superblock\n");
+ return -EIO;
+ }

err = journal_bmap(journal, offset, &blocknr);

I'm about to queue them both for Marcelo, do you have any objection ?

Thanks in advance,
Willy

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-05-23 22:16    [W:0.035 / U:0.968 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site