[PATCH 02/19] mkfs: sanitise ftype parameter values.

Eric Sandeen sandeen at sandeen.net
Thu Mar 24 11:33:44 CDT 2016



On 3/24/16 6:15 AM, jtulak at redhat.com wrote:
> From: Dave Chinner <dchinner at redhat.com>
> 
> Because passing "-n ftype=2" should fail.

but passing crc=1 ftype=1 shouldn't fail, should it?
Seems like it will here.

-Eric

> Signed-off-by: Dave Chinner <dchinner at redhat.com>
> Signed-off-by: Jan Tulak <jtulak at redhat.com>
> Reviewed-by: Brian Foster <bfoster at redhat.com>
> ---
>  mkfs/xfs_mkfs.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index 36e5b4f..979a860 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -1596,7 +1596,15 @@ main(
>  						reqval('n', nopts, N_FTYPE);
>  					if (nftype)
>  						respec('n', nopts, N_FTYPE);
> -					dirftype = atoi(value);
> +					c = atoi(value);
> +					if (c < 0 || c > 1)
> +						illegal(value, "n ftype");
> +					if (crcs_enabled) {
> +						fprintf(stderr,
> +_("cannot specify both crc and ftype\n"));
> +						usage();
> +					}
> +					dirftype = c;
>  					nftype = 1;
>  					break;
>  				default:
> 



More information about the xfs mailing list