aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mtd-utils
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-12 15:00:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-12 15:00:15 +0000
commit3727dbef8b7d4f749d462c8d2e9d58182bddc5bb (patch)
tree5c251d2b848990b49a2690bc00a8a1682768cd90 /tools/mtd-utils
parent23a100cc84584bc78bb01b1f99e27391390583ce (diff)
downloadupstream-3727dbef8b7d4f749d462c8d2e9d58182bddc5bb.tar.gz
upstream-3727dbef8b7d4f749d462c8d2e9d58182bddc5bb.tar.bz2
upstream-3727dbef8b7d4f749d462c8d2e9d58182bddc5bb.zip
tools/mtd-utils: fix a segfault in parsing the device table
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42875 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mtd-utils')
-rw-r--r--tools/mtd-utils/patches/100-sscanf_fix.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/mtd-utils/patches/100-sscanf_fix.patch b/tools/mtd-utils/patches/100-sscanf_fix.patch
new file mode 100644
index 0000000000..2d31f41da7
--- /dev/null
+++ b/tools/mtd-utils/patches/100-sscanf_fix.patch
@@ -0,0 +1,11 @@
+--- a/mkfs.jffs2.c
++++ b/mkfs.jffs2.c
+@@ -423,7 +423,7 @@ static int interpret_table_entry(struct
+
+ if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
+ SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
+- &start, &increment, &count) < 0)
++ &start, &increment, &count) < 10)
+ {
+ return 1;
+ }