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
commitb6be477299c99f63c2afaa1809f90c3d1ef8f557 (patch)
treef9b62197b11f9e9e329bc0152d95f1812a5a3d28 /tools/mtd-utils
parent7cbdc57b40b2ab3b9c53d85d5eedbba260b082ef (diff)
downloadupstream-b6be477299c99f63c2afaa1809f90c3d1ef8f557.tar.gz
upstream-b6be477299c99f63c2afaa1809f90c3d1ef8f557.tar.bz2
upstream-b6be477299c99f63c2afaa1809f90c3d1ef8f557.zip
tools/mtd-utils: fix a segfault in parsing the device table
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42875
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;
+ }