]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ext4: check for extents that wrap around
authorVegard Nossum <vegard.nossum@oracle.com>
Thu, 30 Jun 2016 15:53:46 +0000 (11:53 -0400)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:22:06 +0000 (17:22 -0500)
commitb70626101448ab749ff1bcd99a30ceec70c5b850
tree8c0ee4de0bd7bcb20e555df7f2120c274f0f7005
parent14843183ed0405a47a1e8762ce2b3ca2fac430fc
ext4: check for extents that wrap around

Orabug: 25308116

[ Upstream commit f70749ca42943faa4d4dcce46dfdcaadb1d0c4b6 ]

An extent with lblock = 4294967295 and len = 1 will pass the
ext4_valid_extent() test:

ext4_lblk_t last = lblock + len - 1;

if (len == 0 || lblock > last)
return 0;

since last = 4294967295 + 1 - 1 = 4294967295. This would later trigger
the BUG_ON(es->es_lblk + es->es_len < es->es_lblk) in ext4_es_end().

We can simplify it by removing the - 1 altogether and changing the test
to use lblock + len <= lblock, since now if len = 0, then lblock + 0 ==
lblock and it fails, and if len > 0 then lblock + len > lblock in order
to pass (i.e. it doesn't overflow).

Fixes: 5946d0893 ("ext4: check for overlapping extents in ext4_valid_extent_entries()")
Fixes: 2f974865f ("ext4: check for zero length extent explicitly")
Cc: Eryu Guan <guaneryu@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit c580d82e1d5532b785e339450d43f82e5a8b4e79)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
fs/ext4/extents.c