xfs
[Top] [All Lists]

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

To: xfs@xxxxxxxxxxx
Subject: [PATCH 02/19] mkfs: sanitise ftype parameter values.
From: jtulak@xxxxxxxxxx
Date: Thu, 24 Mar 2016 12:15:19 +0100
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1458818136-56043-1-git-send-email-jtulak@xxxxxxxxxx>
References: <1458818136-56043-1-git-send-email-jtulak@xxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

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

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Jan Tulak <jtulak@xxxxxxxxxx>
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
---
 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:
-- 
2.6.0

<Prev in Thread] Current Thread [Next in Thread>