diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_fsops.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.c | 35 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_rtalloc.c | 4 |
4 files changed, 29 insertions, 13 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index b599e6be9ec1..25e5eae8a976 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
@@ -140,6 +140,8 @@ xfs_growfs_data_private( | |||
140 | pct = in->imaxpct; | 140 | pct = in->imaxpct; |
141 | if (nb < mp->m_sb.sb_dblocks || pct < 0 || pct > 100) | 141 | if (nb < mp->m_sb.sb_dblocks || pct < 0 || pct > 100) |
142 | return XFS_ERROR(EINVAL); | 142 | return XFS_ERROR(EINVAL); |
143 | if ((error = xfs_sb_validate_fsb_count(&mp->m_sb, nb))) | ||
144 | return error; | ||
143 | dpct = pct - mp->m_sb.sb_imax_pct; | 145 | dpct = pct - mp->m_sb.sb_imax_pct; |
144 | error = xfs_read_buf(mp, mp->m_ddev_targp, | 146 | error = xfs_read_buf(mp, mp->m_ddev_targp, |
145 | XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1), | 147 | XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1), |
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index a96bde6df96d..5de1f392e632 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -202,6 +202,27 @@ xfs_mount_free( | |||
202 | kmem_free(mp, sizeof(xfs_mount_t)); | 202 | kmem_free(mp, sizeof(xfs_mount_t)); |
203 | } | 203 | } |
204 | 204 | ||
205 | /* | ||
206 | * Check size of device based on the (data/realtime) block count. | ||
207 | * Note: this check is used by the growfs code as well as mount. | ||
208 | */ | ||
209 | int | ||
210 | xfs_sb_validate_fsb_count( | ||
211 | xfs_sb_t *sbp, | ||
212 | __uint64_t nblocks) | ||
213 | { | ||
214 | ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); | ||
215 | ASSERT(sbp->sb_blocklog >= BBSHIFT); | ||
216 | |||
217 | #if XFS_BIG_BLKNOS /* Limited by ULONG_MAX of page cache index */ | ||
218 | if (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) | ||
219 | return E2BIG; | ||
220 | #else /* Limited by UINT_MAX of sectors */ | ||
221 | if (nblocks << (sbp->sb_blocklog - BBSHIFT) > UINT_MAX) | ||
222 | return E2BIG; | ||
223 | #endif | ||
224 | return 0; | ||
225 | } | ||
205 | 226 | ||
206 | /* | 227 | /* |
207 | * Check the validity of the SB found. | 228 | * Check the validity of the SB found. |
@@ -284,18 +305,8 @@ xfs_mount_validate_sb( | |||
284 | return XFS_ERROR(EFSCORRUPTED); | 305 | return XFS_ERROR(EFSCORRUPTED); |
285 | } | 306 | } |
286 | 307 | ||
287 | ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); | 308 | if (xfs_sb_validate_fsb_count(sbp, sbp->sb_dblocks) || |
288 | ASSERT(sbp->sb_blocklog >= BBSHIFT); | 309 | xfs_sb_validate_fsb_count(sbp, sbp->sb_rblocks)) { |
289 | |||
290 | #if XFS_BIG_BLKNOS /* Limited by ULONG_MAX of page cache index */ | ||
291 | if (unlikely( | ||
292 | (sbp->sb_dblocks >> (PAGE_SHIFT - sbp->sb_blocklog)) > ULONG_MAX || | ||
293 | (sbp->sb_rblocks >> (PAGE_SHIFT - sbp->sb_blocklog)) > ULONG_MAX)) { | ||
294 | #else /* Limited by UINT_MAX of sectors */ | ||
295 | if (unlikely( | ||
296 | (sbp->sb_dblocks << (sbp->sb_blocklog - BBSHIFT)) > UINT_MAX || | ||
297 | (sbp->sb_rblocks << (sbp->sb_blocklog - BBSHIFT)) > UINT_MAX)) { | ||
298 | #endif | ||
299 | xfs_fs_mount_cmn_err(flags, | 310 | xfs_fs_mount_cmn_err(flags, |
300 | "file system too large to be mounted on this system."); | 311 | "file system too large to be mounted on this system."); |
301 | return XFS_ERROR(E2BIG); | 312 | return XFS_ERROR(E2BIG); |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 82304b94646d..871a5bfd8617 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -624,6 +624,7 @@ extern int xfs_sync_inodes(xfs_mount_t *, int, int *); | |||
624 | extern xfs_agnumber_t xfs_initialize_perag(struct bhv_vfs *, xfs_mount_t *, | 624 | extern xfs_agnumber_t xfs_initialize_perag(struct bhv_vfs *, xfs_mount_t *, |
625 | xfs_agnumber_t); | 625 | xfs_agnumber_t); |
626 | extern void xfs_xlatesb(void *, struct xfs_sb *, int, __int64_t); | 626 | extern void xfs_xlatesb(void *, struct xfs_sb *, int, __int64_t); |
627 | extern int xfs_sb_validate_fsb_count(struct xfs_sb *, __uint64_t); | ||
627 | 628 | ||
628 | extern struct xfs_dmops xfs_dmcore_stub; | 629 | extern struct xfs_dmops xfs_dmcore_stub; |
629 | extern struct xfs_qmops xfs_qmcore_stub; | 630 | extern struct xfs_qmops xfs_qmcore_stub; |
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index b3a5f07bd073..47082c01872d 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c | |||
@@ -1882,11 +1882,13 @@ xfs_growfs_rt( | |||
1882 | (nrblocks = in->newblocks) <= sbp->sb_rblocks || | 1882 | (nrblocks = in->newblocks) <= sbp->sb_rblocks || |
1883 | (sbp->sb_rblocks && (in->extsize != sbp->sb_rextsize))) | 1883 | (sbp->sb_rblocks && (in->extsize != sbp->sb_rextsize))) |
1884 | return XFS_ERROR(EINVAL); | 1884 | return XFS_ERROR(EINVAL); |
1885 | if ((error = xfs_sb_validate_fsb_count(sbp, nrblocks))) | ||
1886 | return error; | ||
1885 | /* | 1887 | /* |
1886 | * Read in the last block of the device, make sure it exists. | 1888 | * Read in the last block of the device, make sure it exists. |
1887 | */ | 1889 | */ |
1888 | error = xfs_read_buf(mp, mp->m_rtdev_targp, | 1890 | error = xfs_read_buf(mp, mp->m_rtdev_targp, |
1889 | XFS_FSB_TO_BB(mp, in->newblocks - 1), | 1891 | XFS_FSB_TO_BB(mp, nrblocks - 1), |
1890 | XFS_FSB_TO_BB(mp, 1), 0, &bp); | 1892 | XFS_FSB_TO_BB(mp, 1), 0, &bp); |
1891 | if (error) | 1893 | if (error) |
1892 | return error; | 1894 | return error; |