mkfs.cramfs: validate numeric user inputs

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index a7c2eaa5083c03f377bc4a713c539bdc561f9aa2..4f26b905fe176eba51b702afd3837fb7730b5e23 100644 (file)
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -64,7 +64,7 @@ if BUILD_CRAMFS
 cramfs_common = $(utils_common) cramfs.h cramfs_common.c
 sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
 fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
-mkfs_cramfs_SOURCES = mkfs.cramfs.c mkfs.h $(cramfs_common) $(top_srcdir)/lib/md5.c
+mkfs_cramfs_SOURCES = mkfs.cramfs.c mkfs.h $(cramfs_common) $(top_srcdir)/lib/md5.c $(top_srcdir)/lib/strutils.c
 fsck_cramfs_LDADD = -lz
 mkfs_cramfs_LDADD = -lz
 endif

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 488ef2f2e07e3a25bf0e5c18c00f63c4c0058309..a610e3225192133c535c66d4dd92f1d2a5d77229 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -42,6 +42,7 @@
 #include "md5.h"
 #include "nls.h"
 #include "mkfs.h"
+#include "strutils.h"
 #define XALLOC_EXIT_CODE MKFS_ERROR
 #include "xalloc.h"
 
@@ -732,7 +733,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(MKFS_OK);
                case 'b':
-                       blksize = atoi(optarg);
+                       blksize = strtoll_or_err(optarg, _("failed to parse blocksize argument"));
                        if (blksize <= 0)
                                usage(MKFS_USAGE);
                        break;
@@ -740,7 +741,7 @@ int main(int argc, char **argv)
                        opt_errors = 1;
                        break;
                case 'e':
-                       opt_edition = atoi(optarg);
+                       opt_edition = strtoll_or_err(optarg, _("edition number argument failed"));
                        break;
                case 'N':
                        if (strcmp(optarg, "big") == 0)  {