Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261858AbVCYWox (ORCPT ); Fri, 25 Mar 2005 17:44:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261869AbVCYWoc (ORCPT ); Fri, 25 Mar 2005 17:44:32 -0500 Received: from mail.stdbev.com ([63.161.72.3]:41400 "EHLO mail.standardbeverage.com") by vger.kernel.org with ESMTP id S261858AbVCYWns (ORCPT ); Fri, 25 Mar 2005 17:43:48 -0500 Message-ID: Date: Fri, 25 Mar 2005 16:43:50 -0600 From: "Jason Munro" Subject: Re: 2.6.12-rc1-mm3 (cannot read cd-rom, 2.6.12-rc1 is OK) To: Andrew Morton Cc: , Reply-to: In-Reply-To: <20050325142336.12687e09.akpm@osdl.org> References: <20050325002154.335c6b0b.akpm@osdl.org> <42446B86.7080403@mesatop.com> <424471CB.3060006@mesatop.com> <20050325122433.12469909.akpm@osdl.org> <4244812C.3070402@mesatop.com> <761c884705af2ea412c083d849598ca7@stdbev.com> <20050325140654.430714e2.akpm@osdl.org> <20050325142336.12687e09.akpm@osdl.org> X-Mailer: Hastymail 1.4-CVS x-priority: 3 MIME-Version: 1.0 Content-type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2278 Lines: 69 On 4:23:36 pm 03/25/05 Andrew Morton wrote: > Andrew Morton wrote: > > > > It's the new rock-ridge bounds checking. > > Try this, please? > > diff -puN fs/isofs/rock.c~rock-handle-directory-overflows-fix > fs/isofs/rock.c --- 25/fs/isofs/rock.c~rock-handle-directory-overflows > -fix Fri Mar 25 14:21:32 2005 > +++ 25-akpm/fs/isofs/rock.c Fri Mar 25 14:22:01 2005 > @@ -218,12 +218,12 @@ repeat: > if (rr->len < 3) > goto out; /* Something got screwed up here */ > sig = isonum_721(rs.chr); > + if (rock_check_overflow(&rs, sig)) > + goto eio; > rs.chr += rr->len; > rs.len -= rr->len; > if (rs.len < 0) > goto eio; /* corrupted isofs */ > - if (rock_check_overflow(&rs, sig)) > - goto eio; > > switch (sig) { > case SIG('R', 'R'): > @@ -316,12 +316,12 @@ repeat: > if (rr->len < 3) > goto out; /* Something got screwed up here */ > sig = isonum_721(rs.chr); > + if (rock_check_overflow(&rs, sig)) > + goto eio; > rs.chr += rr->len; > rs.len -= rr->len; > if (rs.len < 0) > goto eio; /* corrupted isofs */ > - if (rock_check_overflow(&rs, sig)) > - goto eio; > > switch (sig) { > #ifndef CONFIG_ZISOFS /* No flag for SF or ZF */ > @@ -694,12 +694,12 @@ repeat: > if (rr->len < 3) > goto out; /* Something got screwed up here */ > sig = isonum_721(rs.chr); > + if (rock_check_overflow(&rs, sig)) > + goto out; > rs.chr += rr->len; > rs.len -= rr->len; > if (rs.len < 0) > goto out; /* corrupted isofs */ > - if (rock_check_overflow(&rs, sig)) > - goto out; > > switch (sig) { > case SIG('R', 'R'): > _ This fixes it here. \__ Jason Munro \__ jason@stdbev.com \__ http://hastymail.sourceforge.net/ - 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/