ext4: Fix wrong comparisons in mext_check_arguments()
PATCH 1/4 ext4: Fix wrong comparisons in mext_check_arguments()
ext4: Fix wrong comparisons in mext_check_arguments()
From: Akira Fujita <[email protected]>
mext_check_arguments() in move_extents.c has wrong comparisons. orig_start which is passed from user-space is block unit, but i_size of inode is byte unit, therefore the checks do not work fine. This mis-check leads to the overflow of 'len' and then hits BUG_ON()
in ext4_move_extens(). The patch fixes this issue.
--- fs/ext4/move_extent.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-)
fs/ext4/move_extent.c +18 -11
@@ -972,43 +972,52 @@ mext_check_arguments(struct inode *orig_inode, }if (orig_inode->i_size > donor_inode->i_size) { -if (orig_start >= donor_inode->i_size) { +if (orig_start << orig_inode->i_blkbits >= + donor_inode->i_size) {ext4_debug ("ext4 move extent: orig start offset " "[%llu] should be less than donor file size " "[%lld] [ino:orig %lu, donor_inode %lu]\n" , - orig_start, donor_inode->i_size, - orig_inode->i_ino, donor_inode->i_ino); + orig_start << orig_inode->i_blkbits, + donor_inode->i_size, orig_inode->i_ino, + donor_inode->i_ino);return -EINVAL ; } - -if (orig_start + *len > donor_inode->i_size) { +if ((orig_start + *len) << orig_inode->i_blkbits > + donor_inode->i_size) {ext4_debug ("ext4 move extent: End offset [%llu] should " "be less than donor file size [%lld]." "So adjust length from %llu to %lld " "[ino:orig %lu, donor %lu]\n" , - orig_start + *len, donor_inode->i_size, - *len, donor_inode->i_size - orig_start, + (orig_start + *len) << orig_inode->i_blkbits, + donor_inode->i_size, + *len, (donor_inode->i_size >> + orig_inode->i_blkbits) - orig_start, orig_inode->i_ino, donor_inode->i_ino); - *len = donor_inode->i_size - orig_start; + *len = (donor_inode->i_size >> orig_inode->i_blkbits) - + orig_start; } }else { -if (orig_start >= orig_inode->i_size) { +if (orig_start << orig_inode->i_blkbits >= + orig_inode->i_size) {ext4_debug ("ext4 move extent: start offset [%llu] " "should be less than original file size " "[%lld] [inode:orig %lu, donor %lu]\n" , - orig_start, orig_inode->i_size, - orig_inode->i_ino, donor_inode->i_ino); + orig_start << orig_inode->i_blkbits, + orig_inode->i_size, orig_inode->i_ino, + donor_inode->i_ino);return -EINVAL ; }
Hi, Akira,
Quoted 9 lines · Akira Fujita
ext4: Fix wrong comparisons in
mext_check_arguments()From: Akira Fujita <[email protected]>
mext_check_arguments()inmove_extents.chas wrong comparisons.orig_startwhich is passed from user-space is block unit, buti_sizeof inode is byte unit, therefore the checks do not work fine. This mis-check leads to the overflow of 'len' and then hitsBUG_ON()
inext4_move_extens(). The patch fixes this issue.
While the bug is true, I wander if it checks all conditions, because i_size isn't blocksize aligned.
Quoted 82 lines
Signed-off-by Akira Fujita <[email protected]>--- fs/ext4/move_extent.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-)fs/ext4/move_extent.c +24
-16@@ -972,43 +972,52 @@ mext_check_arguments(struct inode *orig_inode, }if (orig_inode->i_size > donor_inode->i_size) { -if (orig_start >= donor_inode->i_size) { +if (orig_start << orig_inode->i_blkbits >= + donor_inode->i_size) {ext4_debug ("ext4 move extent: orig start offset " "[%llu] should be less than donor file size " "[%lld] [ino:orig %lu, donor_inode %lu]\n" , - orig_start, donor_inode->i_size, - orig_inode->i_ino, donor_inode->i_ino); + orig_start << orig_inode->i_blkbits, + donor_inode->i_size, orig_inode->i_ino, + donor_inode->i_ino);return -EINVAL ; } - -if (orig_start + *len > donor_inode->i_size) { +if ((orig_start + *len) << orig_inode->i_blkbits > + donor_inode->i_size) {ext4_debug ("ext4 move extent: End offset [%llu] should " "be less than donor file size [%lld]." "So adjust length from %llu to %lld " "[ino:orig %lu, donor %lu]\n" , - orig_start + *len, donor_inode->i_size, - *len, donor_inode->i_size - orig_start, + (orig_start + *len) << orig_inode->i_blkbits, + donor_inode->i_size, + *len, (donor_inode->i_size >> + orig_inode->i_blkbits) - orig_start, orig_inode->i_ino, donor_inode->i_ino); - *len = donor_inode->i_size - orig_start; + *len = (donor_inode->i_size >> orig_inode->i_blkbits) - + orig_start; } }else { -if (orig_start >= orig_inode->i_size) { +if (orig_start << orig_inode->i_blkbits >= + orig_inode->i_size) {ext4_debug ("ext4 move extent: start offset [%llu] " "should be less than original file size " "[%lld] [inode:orig %lu, donor %lu]\n" , - orig_start, orig_inode->i_size, - orig_inode->i_ino, donor_inode->i_ino); + orig_start << orig_inode->i_blkbits, + orig_inode->i_size, orig_inode->i_ino, + donor_inode->i_ino);return -EINVAL ; } - -if (orig_start + *len > orig_inode->i_size) { +if ((orig_start + *len) << orig_inode->i_blkbits > + orig_inode->i_size) {ext4_debug ("ext4 move extent: Adjust length " "from %llu to %lld. Because it should be " "less than original file size " "[ino:orig %lu, donor %lu]\n" , - *len, orig_inode->i_size - orig_start, + *len, (orig_inode->i_size >> + orig_inode->i_blkbits) - orig_start, orig_inode->i_ino, donor_inode->i_ino); - *len = orig_inode->i_size - orig_start; + *len = (orig_inode->i_size >> orig_inode->i_blkbits) - + orig_start; } } --To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 4 lines
Best Regards, Peng Tao State Key Laboratory of Networking and Switching Technology Beijing Univ. of Posts and Telecoms.
Theodore Tso
maintainerQuoted 9 lines · Akira Fujita
ext4: Fix wrong comparisons in
mext_check_arguments()From: Akira Fujita <[email protected]>
mext_check_arguments()inmove_extents.chas wrong comparisons.orig_startwhich is passed from user-space is block unit, buti_sizeof inode is byte unit, therefore the checks do not work fine. This mis-check leads to the overflow of 'len' and then hitsBUG_ON()
inext4_move_extens(). The patch fixes this issue.
Thanks, I've added this to the ext4 patch queue to be pushed when the 2.6.32 merge window opens.
- Ted
Akira Fujita
Reviewed-by Greg FreemyerHi Ted,
We found that "fix-wrong-comparisons-in-mext_check_arguments" in the ext4 patch queue does not fix the objective issue completely. (The last partial block is not checked in mext_check_arguments().)
Could you replace "fix-wrong-comparisons-in-mext_check_arguments" in the ext4 patch queue with this patch ?
Regards,
Akira Fujita
Quoted 11 lines · Theodore Tso
Quoted 9 lines · Akira Fujita
ext4: Fix wrong comparisons in
mext_check_arguments()From: Akira Fujita <[email protected]>
mext_check_arguments()inmove_extents.chas wrong comparisons.orig_startwhich is passed from user-space is block unit, buti_sizeof inode is byte unit, therefore the checks do not work fine. This mis-check leads to the overflow of 'len' and then hitsBUG_ON()
inext4_move_extens(). The patch fixes this issue.
Quoted 4 lines
Thanks, I've added this to the ext4 patch queue to be pushed when the 2.6.32 merge window opens.
- Ted
--- move_extent.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-)
fs/ext4/move_extent.c +27 -19
@@ -898,6 +898,10 @@ mext_check_arguments(struct inode *orig_inode, struct inode *donor_inode, __u64 orig_start, __u64 donor_start, __u64 *len, __u64 moved_len) { + ext4_lblk_t orig_blocks, donor_blocks; +unsigned int blkbits = orig_inode->i_blkbits; +unsigned int blocksize =1 << blkbits; +/* Regular file check */ if (!S_ISREG (orig_inode->i_mode) || !S_ISREG (donor_inode->i_mode)) { ext4_debug("ext4 move extent: The argument files should be "
@@ -972,43 +976,47 @@ mext_check_arguments(struct inode *orig_inode, }if (orig_inode->i_size > donor_inode->i_size) { -if (orig_start >= donor_inode->i_size) { + donor_blocks = (donor_inode->i_size + blocksize -1 ) >> blkbits; +/* TODO: eliminate this artificial restriction */ +if (orig_start >= donor_blocks) {ext4_debug ("ext4 move extent: orig start offset " -"[%llu] should be less than donor file size " -"[%lld] [ino:orig %lu, donor_inode %lu]\n" , - orig_start, donor_inode->i_size, +"[%llu] should be less than donor file blocks " +"[%u] [ino:orig %lu, donor %lu]\n" , + orig_start, donor_blocks, orig_inode->i_ino, donor_inode->i_ino);return -EINVAL ; } -if (orig_start + *len > donor_inode->i_size) { +/* TODO: eliminate this artificial restriction */ +if (orig_start + *len > donor_blocks) {ext4_debug ("ext4 move extent: End offset [%llu] should " -"be less than donor file size [%lld]." -"So adjust length from %llu to %lld " +"be less than donor file blocks [%u]." +"So adjust length from %llu to %llu " "[ino:orig %lu, donor %lu]\n" , - orig_start + *len, donor_inode->i_size, - *len, donor_inode->i_size - orig_start, + orig_start + *len, donor_blocks, + *len, donor_blocks - orig_start, orig_inode->i_ino, donor_inode->i_ino); - *len = donor_inode->i_size - orig_start; + *len = donor_blocks - orig_start; } }else { -if (orig_start >= orig_inode->i_size) { + orig_blocks = (orig_inode->i_size + blocksize -1 ) >> blkbits; +if (orig_start >= orig_blocks) {ext4_debug ("ext4 move extent: start offset [%llu] " -"should be less than original file size " -"[%lld] [inode:orig %lu, donor %lu]\n" , - orig_start, orig_inode->i_size, +"should be less than original file blocks " +"[%u] [ino:orig %lu, donor %lu]\n" , + orig_start, orig_blocks, orig_inode->i_ino, donor_inode->i_ino);return -EINVAL ; } -if (orig_start + *len > orig_inode->i_size) { +if (orig_start + *len > orig_blocks) {ext4_debug ("ext4 move extent: Adjust length " -"from %llu to %lld. Because it should be " -"less than original file size " +"from %llu to %llu. Because it should be " +"less than original file blocks " "[ino:orig %lu, donor %lu]\n" , - *len, orig_inode->i_size - orig_start, + *len, orig_blocks - orig_start, orig_inode->i_ino, donor_inode->i_ino); - *len = orig_inode->i_size - orig_start; + *len = orig_blocks - orig_start; } }
Theodore Tso
maintainerQuoted 8 lines · Akira Fujita
Hi Ted,
We found that "fix-wrong-comparisons-in-mext_check_arguments" in the ext4 patch queue does not fix the objective issue completely. (The last partial block is not checked in
mext_check_arguments().)Could you replace "fix-wrong-comparisons-in-mext_check_arguments" in the ext4 patch queue with this patch ?
Done, thanks.
- Ted