On Tue, Oct 13, 2020 at 12:06:27PM +0800, Gao Xiang wrote:
> Check stripe numbers in calc_stripe_factors() by using
> xfs_validate_stripe_geometry().
>
> Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> libxfs/libxfs_api_defs.h | 1 +
> mkfs/xfs_mkfs.c | 23 +++++++----------------
> 2 files changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
> index e7e42e93..306d0deb 100644
> --- a/libxfs/libxfs_api_defs.h
> +++ b/libxfs/libxfs_api_defs.h
> @@ -188,6 +188,7 @@
> #define xfs_trans_roll_inode libxfs_trans_roll_inode
> #define xfs_trans_roll libxfs_trans_roll
>
> +#define xfs_validate_stripe_geometry libxfs_validate_stripe_geometry
> #define xfs_verify_agbno libxfs_verify_agbno
> #define xfs_verify_agino libxfs_verify_agino
> #define xfs_verify_cksum libxfs_verify_cksum
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index 8fe149d7..aec40c1f 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -2305,12 +2305,6 @@ _("both data su and data sw options must be specified\n"));
> usage();
> }
>
> - if (dsu % cfg->sectorsize) {
> - fprintf(stderr,
> -_("data su must be a multiple of the sector size (%d)\n"), cfg->sectorsize);
> - usage();
> - }
> -
> dsunit = (int)BTOBBT(dsu);
> big_dswidth = (long long int)dsunit * dsw;
> if (big_dswidth > INT_MAX) {
> @@ -2322,13 +2316,9 @@ _("data stripe width (%lld) is too large of a multiple of the data stripe unit (
> dswidth = big_dswidth;
> }
>
> - if ((dsunit && !dswidth) || (!dsunit && dswidth) ||
> - (dsunit && (dswidth % dsunit != 0))) {
> - fprintf(stderr,
> -_("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"),
> - dswidth, dsunit);
> + if (!libxfs_validate_stripe_geometry(NULL, BBTOB(dsunit), BBTOB(dswidth),
> + cfg->sectorsize, false))
> usage();
> - }
>
> /* If sunit & swidth were manually specified as 0, same as noalign */
> if ((cli_opt_set(&dopts, D_SUNIT) || cli_opt_set(&dopts, D_SU)) &&
> @@ -2344,11 +2334,12 @@ _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"),
>
> /* if no stripe config set, use the device default */
> if (!dsunit) {
> - /* Ignore nonsense from device. XXX add more validation */
> - if (ft->dsunit && ft->dswidth == 0) {
> + /* Ignore nonsense from device report. */
> + if (!libxfs_validate_stripe_geometry(NULL, BBTOB(ft->dsunit),
> + BBTOB(ft->dswidth), 0, true)) {
> fprintf(stderr,
> -_("%s: Volume reports stripe unit of %d bytes and stripe width of 0, ignoring.\n"),
> - progname, BBTOB(ft->dsunit));
> +_("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\n"),
> + progname, BBTOB(ft->dsunit), BBTOB(ft->dswidth));
> ft->dsunit = 0;
> ft->dswidth = 0;
> } else {
> --
> 2.18.1
>
