From: Jan Kara Date: Thu, 18 May 2017 23:36:23 +0000 (-0700) Subject: xfs: Fix off-by-in in loop termination in xfs_find_get_desired_pgoff() X-Git-Tag: v4.1.12-117.0_27200813_3~38 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a6bd9d360490fdfdd855fac05c6c8b4caea7637e;p=users%2Fjedix%2Flinux-maple.git xfs: Fix off-by-in in loop termination in xfs_find_get_desired_pgoff() There is an off-by-one error in loop termination conditions in xfs_find_get_desired_pgoff() since 'end' may index a page beyond end of desired range if 'endoff' is page aligned. It doesn't have any visible effects but still it is good to fix it. Signed-off-by: Jan Kara Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Orabug: 27093425 (backport upstream commit d7fd24257aa60316bf81093f7f909dc9475ae974) Signed-off-by: Shan Hai --- diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 4b9d0276acf9..668f70e6d1c2 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1188,7 +1188,7 @@ xfs_find_get_desired_pgoff( index = startoff >> PAGE_CACHE_SHIFT; endoff = XFS_FSB_TO_B(mp, map->br_startoff + map->br_blockcount); - end = endoff >> PAGE_CACHE_SHIFT; + end = (endoff - 1) >> PAGE_CACHE_SHIFT; do { int want; unsigned nr_pages;