From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Wed, 27 Sep 2017 01:41:12 +0000 (-0500)
Subject: mkfs: don't overflow the subopts array
X-Git-Tag: v4.13.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efe512176ca32ca08dfb0d2497ae8d9a4990f21e;p=thirdparty%2Fxfsprogs-dev.git

mkfs: don't overflow the subopts array

The new -d cowextsize option overran the subopts array; make it larger.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 305812940..5bfec038b 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -39,7 +39,7 @@ static int  ispow2(unsigned int i);
 unsigned int		blocksize;
 unsigned int		sectorsize;
 
-#define MAX_SUBOPTS	16
+#define MAX_SUBOPTS	17
 #define SUBOPT_NEEDS_VAL	(-1LL)
 #define MAX_CONFLICTS	8
 #define LAST_CONFLICT	(-1)