diff options
-rw-r--r-- | fs/ioctl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c index 5612880fcbe7..7b17a14396ff 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
@@ -162,20 +162,21 @@ EXPORT_SYMBOL(fiemap_check_flags); | |||
162 | static int fiemap_check_ranges(struct super_block *sb, | 162 | static int fiemap_check_ranges(struct super_block *sb, |
163 | u64 start, u64 len, u64 *new_len) | 163 | u64 start, u64 len, u64 *new_len) |
164 | { | 164 | { |
165 | u64 maxbytes = (u64) sb->s_maxbytes; | ||
166 | |||
165 | *new_len = len; | 167 | *new_len = len; |
166 | 168 | ||
167 | if (len == 0) | 169 | if (len == 0) |
168 | return -EINVAL; | 170 | return -EINVAL; |
169 | 171 | ||
170 | if (start > sb->s_maxbytes) | 172 | if (start > maxbytes) |
171 | return -EFBIG; | 173 | return -EFBIG; |
172 | 174 | ||
173 | /* | 175 | /* |
174 | * Shrink request scope to what the fs can actually handle. | 176 | * Shrink request scope to what the fs can actually handle. |
175 | */ | 177 | */ |
176 | if ((len > sb->s_maxbytes) || | 178 | if (len > maxbytes || (maxbytes - len) < start) |
177 | (sb->s_maxbytes - len) < start) | 179 | *new_len = maxbytes - start; |
178 | *new_len = sb->s_maxbytes - start; | ||
179 | 180 | ||
180 | return 0; | 181 | return 0; |
181 | } | 182 | } |