Commit ef1f7a7e authored Oct 06, 2009 by Bernd Schmidt Committed by Linus Torvalds Oct 11, 2009

ROMFS: fix length used with romfs_dev_strnlen() function



An interestingly corrupted romfs file system exposed a problem with the
romfs_dev_strnlen function: it's passing the wrong value to its helpers.
Rather than limit the string to the length passed in by the callers, it
uses the size of the device as the limit.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c6c59927

fs/romfs/storage.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -253,11 +253,11 @@ ssize_t romfs_dev_strnlen(struct super_block *sb,

	#ifdef CONFIG_ROMFS_ON_MTD		#ifdef CONFIG_ROMFS_ON_MTD
	if (sb->s_mtd)		if (sb->s_mtd)
	return romfs_mtd_strnlen(sb, pos, limit);		return romfs_mtd_strnlen(sb, pos, maxlen);
	#endif		#endif
	#ifdef CONFIG_ROMFS_ON_BLOCK		#ifdef CONFIG_ROMFS_ON_BLOCK
	if (sb->s_bdev)		if (sb->s_bdev)
	return romfs_blk_strnlen(sb, pos, limit);		return romfs_blk_strnlen(sb, pos, maxlen);
	#endif		#endif
	return -EIO;		return -EIO;
	}		}