Skip to contentSkip to conversation

vfs: explicitly cast s_maxbytes in fiemap_check_ranges

PATCH In review [email protected] 1 participant 1 message Sep 18, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 11/21 vfs: explicitly cast s_maxbytes in fiemap_check_ranges

From: Jeff Layton <[email protected]>

If fiemap_check_ranges is passed a large enough value, then it's possible that the value would be cast to a signed value for comparison against s_maxbytes when we change it to loff_t. Make sure that doesn't happen by explicitly casting s_maxbytes to an unsigned value for the purposes of comparison.

Cc Christoph Hellwig <[email protected]>
Cc Robert Love <[email protected]>
Cc Al Viro <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Mandeep Singh Baines <[email protected]>

---

 fs/ioctl.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
fs/ioctl.c renamed from fs/ioctl.c~vfs-explicitly-cast-s_maxbytes-in-fiemap_check_ranges +5 -4
diff -puN fs/ioctl.c~vfs-explicitly-cast-s_maxbytes-in-fiemap_check_ranges fs/ioctl.c
@@ -162,20 +162,21 @@ EXPORT_SYMBOL(fiemap_check_flags);
 static int fiemap_check_ranges(struct super_block *sb,
 			       u64 start, u64 len, u64 *new_len)
 {
+	u64 maxbytes = (u64) sb->s_maxbytes;
+
 	*new_len = len;
 
 	if (len == 0)
 		return -EINVAL;
 
-	if (start > sb->s_maxbytes)
+	if (start > maxbytes)
 		return -EFBIG;
 
 	/*
 	 * Shrink request scope to what the fs can actually handle.
 	 */
-	if ((len > sb->s_maxbytes) ||
-	    (sb->s_maxbytes - len) < start)
-		*new_len = sb->s_maxbytes - start;
+	if (len > maxbytes || (maxbytes - len) < start)
+		*new_len = maxbytes - start;
 
 	return 0;
 }

_