From: Dave Chinner <dchinner@redhat.com>
Date: Tue, 10 May 2016 07:16:06 +0000 (+1000)
Subject: mkfs: sanitise ftype parameter values.
X-Git-Tag: v4.7.0-rc1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff21c709d393c73506c9888d6a4bd0f6b23c88aa;p=thirdparty%2Fxfsprogs-dev.git

mkfs: sanitise ftype parameter values.

Because passing "-n ftype=2" should fail.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 5527b872c..4be14dace 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1597,7 +1597,10 @@ 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");
+					dirftype = c;
 					nftype = 1;
 					break;
 				default: