| Message ID | 20120221.202733.1840554502153600636.davem@davemloft.net |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Feb 21, 2012 at 08:27:33PM -0500, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Tue, 21 Feb 2012 18:33:10 -0500 (EST) > > > From: David Miller <davem@davemloft.net> > > Date: Tue, 21 Feb 2012 18:10:07 -0500 (EST) > > > >> For example, I just found a bug with symlink handling in path > >> traversal fixed by the following patch. So if there are symlinks > >> involved in Meelis's setup that would be the cause rather than not > >> specifically using ext2 for the boot partition. > >> > >> -------------------- > >> ext2: Fix symlink being overwritten. > > > > Ignore me, there is no bug. All callers specifically use a special > > on-stack inode buffer to avoid this problem. > > Ok, while waiting for the debug dump from Meelis I think I found the > problem. > > With my test harness I reproduced a case similar to what Meelis saw > but it has nothing to do with ext3'ness or anything like that. > > The block group descriptors were having their location miscalculated. > It only worked for the first block of group descriptors. > > So if an inode is outside of the first several block groups, things > don't work. I guess for most /boot partitions, which are relatively > small, most if not all of the files fit into the working range. > > Jurij, can you possibly build a test package for Meelis to see if this > fixes the reported bug? Sure, a new package with this patch included is available at http://www.wooyd.org/silo/ Best regards,
> > Jurij, can you possibly build a test package for Meelis to see if this > > fixes the reported bug? > > Sure, a new package with this patch included is available at > http://www.wooyd.org/silo/ This silo works for me, thank you!
From: mroos@linux.ee Date: Thu, 23 Feb 2012 08:05:05 +0200 (EET) >> > Jurij, can you possibly build a test package for Meelis to see if this >> > fixes the reported bug? >> >> Sure, a new package with this patch included is available at >> http://www.wooyd.org/silo/ > > This silo works for me, thank you! Thanks a lot for testing. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/second/fs/ext2.c b/second/fs/ext2.c index 710695a..7eb665f 100644 --- a/second/fs/ext2.c +++ b/second/fs/ext2.c @@ -57,6 +57,8 @@ struct silo_ext2_state { __u32 block_size; __u32 addr_per_block; __u32 addr_per_block_bits; + __u32 desc_per_block; + __u32 desc_per_block_bits; }; static struct silo_ext2_state *sstate; @@ -285,8 +287,8 @@ static void read_group(struct silo_ext2_state *s, __u32 grp_no, __u32 first = ext2_to_cpu_32(s->super->s_first_data_block); __u32 blk, offset; - blk = first + 1; - offset = grp_no * sizeof(*grp); + blk = first + 1 + (grp_no >> s->desc_per_block_bits); + offset = (grp_no & (s->desc_per_block - 1)) * sizeof(*grp); read_data(s, blk, offset, sizeof(*grp), grp); } @@ -371,6 +373,8 @@ static int open_ext2(char *device) s->addr_per_block = s->block_size / sizeof(__u32); s->addr_per_block_bits = calc_ilog2(s->addr_per_block); + s->desc_per_block = s->block_size / sizeof(struct ext2_group_desc); + s->desc_per_block_bits = calc_ilog2(s->desc_per_block); s->scratch_block[0] = malloc(s->block_size * 4); if (!s->scratch_block[0]) {