xfs
[Top] [All Lists]

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

To: xfs@xxxxxxxxxxx
Subject: [PATCH 02/17] mkfs: sanitise ftype parameter values.
From: Jan ÅulÃk <jtulak@xxxxxxxxxx>
Date: Fri, 19 Jun 2015 13:01:51 +0200
Cc: david@xxxxxxxxxxxxx, Dave Chinner <dchinner@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1434711726-13092-1-git-send-email-jtulak@xxxxxxxxxx>
References: <1434711726-13092-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 ÅulÃk <jtulak@xxxxxxxxxx>
---
 mkfs/xfs_mkfs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index d0de90d..1652903 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1617,12 +1617,15 @@ _("cannot specify both crc and ftype\n"));
                                                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.1.0

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