2007-12-03 23:29:45

by Eric Sandeen

Subject: [PATCH 1/4] ext4: minor fix in jbd2 stats kmalloc failure case

(Mingming: these 4 patches can apply after
jbd-stats-through-procfs-with-external-journal-oops-fix.patch)

---------------------------------------------------------------------

The other instance of this problem was caught, but this one got missed:
Free the correct pointer on s->stats allocation failure in jbd2_seq_info_open

Signed-off-by: Eric Sandeen <[email protected]>

---

Index: linux-2.6.24-rc3/fs/jbd2/journal.c
===================================================================
--- linux-2.6.24-rc3.orig/fs/jbd2/journal.c
+++ linux-2.6.24-rc3/fs/jbd2/journal.c
@@ -850,7 +850,7 @@ static int jbd2_seq_info_open(struct ino
return -EIO;
size = sizeof(struct transaction_stats_s);
s->stats = kmalloc(size, GFP_KERNEL);
- if (s == NULL) {
+ if (s->stats == NULL) {
kfree(s);
return -EIO;
}

2007-12-04 00:23:50

by Mingming Cao

Subject: Re: [PATCH 1/4] ext4: minor fix in jbd2 stats kmalloc failure case

On Mon, 2007-12-03 at 17:29 -0600, Eric Sandeen wrote:
> (Mingming: these 4 patches can apply after
> jbd-stats-through-procfs-with-external-journal-oops-fix.patch)
>
Thanks Eric, looks all good to me. Updated the patch queue with the four
jbd2 stats fixes from you.

Mingming