Perhaps this is simpler, and preferable. Thanks to adilger for reminding me about printk_ratelimit. :) ---- This attempts to address CVE-2006-6058 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-6058 first reported at http://projects.info-pull.com/mokb/MOKB-17-11-2006.html Essentially a corrupted minix dir inode reporting a very large i_size will loop for a very long time in minix_readdir, minix_find_entry, etc, because on EIO they just move on to try the next page. This is under the BKL, printk-storming as well. This can lock up the machine for a very long time. Simply ratelimiting the printks gets things back under control. Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> Index: linux-2.6.22-rc4/fs/minix/itree_v1.c =================================================================== --- linux-2.6.22-rc4.orig/fs/minix/itree_v1.c +++ linux-2.6.22-rc4/fs/minix/itree_v1.c @@ -27,7 +27,8 @@ static int block_to_path(struct inode * if (block < 0) { printk("minix_bmap: block<0\n"); } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { - printk("minix_bmap: block>big\n"); + if (printk_ratelimit()) + printk("minix_bmap: block>big\n"); } else if (block < 7) { offsets[n++] = block; } else if ((block -= 7) < 512) { Index: linux-2.6.22-rc4/fs/minix/itree_v2.c =================================================================== --- linux-2.6.22-rc4.orig/fs/minix/itree_v2.c +++ linux-2.6.22-rc4/fs/minix/itree_v2.c @@ -28,7 +28,8 @@ static int block_to_path(struct inode * if (block < 0) { printk("minix_bmap: block<0\n"); } else if (block >= (minix_sb(inode->i_sb)->s_max_size/sb->s_blocksize)) { - printk("minix_bmap: block>big\n"); + if (printk_ratelimit()) + printk("minix_bmap: block>big\n"); } else if (block < 7) { offsets[n++] = block; } else if ((block -= 7) < 256) { - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
