Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262759AbVDYUDy (ORCPT ); Mon, 25 Apr 2005 16:03:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262760AbVDYUDy (ORCPT ); Mon, 25 Apr 2005 16:03:54 -0400 Received: from colino.net ([213.41.131.56]:2546 "EHLO paperstreet.colino.net") by vger.kernel.org with ESMTP id S262759AbVDYUDu (ORCPT ); Mon, 25 Apr 2005 16:03:50 -0400 Date: Mon, 25 Apr 2005 22:03:45 +0200 From: Colin Leroy To: Roman Zippel Cc: "linux-kernel@vger.kernel.org" , Andrew Morton Subject: Re: [PATCH] hfsplus: don't oops on bad FS Message-ID: <20050425220345.6b2ed6d5@jack.colino.net> In-Reply-To: References: <20050425211915.126ddab5@jack.colino.net> X-Mailer: Sylpheed-Claws 1.9.6cvs36 (GTK+ 2.6.4; powerpc-unknown-linux-gnu) X-Face: Fy:*XpRna1/tz}cJ@O'0^:qYs:8b[Rg`*8,+o^[fI?<%5LeB,Xz8ZJK[r7V0hBs8G)*&C+XA0qHoR=LoTohe@7X5K$A-@cN6n~~J/]+{[)E4h'lK$13WQf$.R+Pi;E09tk&{t|;~dakRD%CLHrk6m!?gA,5|Sb=fJ=>[9#n1Bu8?VngkVM4{'^'V_qgdA.8yn3) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1733 Lines: 71 On 25 Apr 2005 at 21h04, Roman Zippel wrote: Hi, > Actually it looks like we are always leaking it, so actually > hfsplus_put_super() needs fixing, could you add the check and kfree > there and do the same fix for hfs? Mmh, right. Here's an updated version that fixes it too. Signed-off-by: Colin Leroy --- a/fs/hfsplus/super.c 2005-04-25 21:56:56.000000000 +0200 +++ b/fs/hfsplus/super.c 2005-04-25 21:58:39.000000000 +0200 @@ -226,6 +226,9 @@ brelse(HFSPLUS_SB(sb).s_vhbh); if (HFSPLUS_SB(sb).nls) unload_nls(HFSPLUS_SB(sb).nls); + + kfree((struct hfsplus_sb_info *)sb->s_fs_info); + sb->s_fs_info = NULL; } static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf) @@ -298,7 +301,7 @@ if (!silent) printk("HFS+-fs: unable to parse mount options\n"); err = -EINVAL; - goto cleanup; + goto cleanup_little; } /* temporarily use utf8 to correctly find the hidden dir below */ @@ -307,7 +310,7 @@ if (!nls) { printk("HFS+: unable to load nls for utf8\n"); err = -EINVAL; - goto cleanup; + goto cleanup_little; } /* Grab the volume header */ @@ -315,7 +318,7 @@ if (!silent) printk("HFS+-fs: unable to find HFS+ superblock\n"); err = -EINVAL; - goto cleanup; + goto cleanup_little; } vhdr = HFSPLUS_SB(sb).s_vhdr; @@ -428,8 +431,12 @@ cleanup: hfsplus_put_super(sb); + +cleanup_little: if (nls) unload_nls(nls); + sb->s_fs_info = NULL; + kfree(sbi); return err; } -- Colin - 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/