Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ef1f7a7e878e4ae37b3a78ebdeef9f911bae59df

Authored by Bernd Schmidt
Committed by Linus Torvalds
1 parent c6c5992723
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -253,11 +253,11 @@
253 253  
254 254 #ifdef CONFIG_ROMFS_ON_MTD
255 255 if (sb->s_mtd)
256   - return romfs_mtd_strnlen(sb, pos, limit);
  256 + return romfs_mtd_strnlen(sb, pos, maxlen);
257 257 #endif
258 258 #ifdef CONFIG_ROMFS_ON_BLOCK
259 259 if (sb->s_bdev)
260   - return romfs_blk_strnlen(sb, pos, limit);
  260 + return romfs_blk_strnlen(sb, pos, maxlen);
261 261 #endif
262 262 return -EIO;
263 263 }