mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
SCSI: scsi_debug: Fix off-by-one bug when unmapping region
commitbc977749e9
upstream. Currently it is possible to unmap one more block than user requested to due to the off-by-one error in unmap_region(). This is probably due to the fact that the end variable despite its name actually points to the last block to unmap + 1. However in the condition it is handled as the last block of the region to unmap. The bug was not previously spotted probably due to the fact that the region was not zeroed, which has changed with commitbe1dd78de5
. With that commit we were able to corrupt the ext4 file system on 256M scsi_debug device with LBPRZ enabled using fstrim. Since the 'end' semantic is the same in several functions there this commit just fixes the condition to use the 'end' variable correctly in that context. Reported-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Lukas Czerner <lczerner@redhat.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Acked-by: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
791f153c5b
commit
023f18fee6
1 changed files with 1 additions and 1 deletions
|
@ -2054,7 +2054,7 @@ static void unmap_region(sector_t lba, unsigned int len)
|
|||
block = lba + alignment;
|
||||
rem = do_div(block, granularity);
|
||||
|
||||
if (rem == 0 && lba + granularity <= end && block < map_size) {
|
||||
if (rem == 0 && lba + granularity < end && block < map_size) {
|
||||
clear_bit(block, map_storep);
|
||||
if (scsi_debug_lbprz)
|
||||
memset(fake_storep +
|
||||
|
|
Loading…
Reference in a new issue