Import Debian version 5.04-5+squeeze3

debian/patches/CVE-2014-1943.patch

@@ -0,0 +1,136 @@
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Description:
+ prevent infinite recursion.
+ count indirect recursion as recursion.
+
+Upstream commit IDs:
+    3c081560c23f20b2985c285338b52c7aae9fdb0f
+    cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
+
+Backport for 5.04: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+
+--- a/src/ascmagic.c
++++ b/src/ascmagic.c
+@@ -151,7 +151,7 @@
+ 	if ((utf8_end = encode_utf8(utf8_buf, mlen, ubuf, ulen)) == NULL)
+ 		goto done;
+ 	if ((rv = file_softmagic(ms, utf8_buf, (size_t)(utf8_end - utf8_buf),
+-	    TEXTTEST)) != 0)
++	    0, TEXTTEST)) != 0)
+ 		goto done;
+ 	else
+ 		rv = -1;
+--- a/src/file.h
++++ b/src/file.h
+@@ -378,7 +378,7 @@
+     unichar **, size_t *, const char **, const char **, const char **);
+ protected int file_is_tar(struct magic_set *, const unsigned char *, size_t);
+ protected int file_softmagic(struct magic_set *, const unsigned char *, size_t,
+-    int);
++    size_t, int);
+ protected struct mlist *file_apprentice(struct magic_set *, const char *, int);
+ protected uint64_t file_signextend(struct magic_set *, struct magic *,
+     uint64_t);
+--- a/src/funcs.c
++++ b/src/funcs.c
+@@ -227,7 +227,7 @@
+ 
+ 	/* try soft magic tests */
+ 	if ((ms->flags & MAGIC_NO_CHECK_SOFT) == 0)
+-		if ((m = file_softmagic(ms, ubuf, nb, BINTEST)) != 0) {
++		if ((m = file_softmagic(ms, ubuf, nb, 0, BINTEST)) != 0) {
+ 			if ((ms->flags & MAGIC_DEBUG) != 0)
+ 				(void)fprintf(stderr, "softmagic %d\n", m);
+ #ifdef BUILTIN_ELF
+--- a/src/softmagic.c
++++ b/src/softmagic.c
+@@ -43,9 +43,9 @@
+ 
+ 
+ private int match(struct magic_set *, struct magic *, uint32_t,
+-    const unsigned char *, size_t, int);
++    const unsigned char *, size_t, int, int);
+ private int mget(struct magic_set *, const unsigned char *,
+-    struct magic *, size_t, unsigned int);
++    struct magic *, size_t, unsigned int, int);
+ private int magiccheck(struct magic_set *, struct magic *);
+ private int32_t mprint(struct magic_set *, struct magic *);
+ private int32_t moffset(struct magic_set *, struct magic *);
+@@ -66,12 +66,12 @@
+  */
+ /*ARGSUSED1*/		/* nbytes passed for regularity, maybe need later */
+ protected int
+-file_softmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes, int mode)
++file_softmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes, size_t level, int mode)
+ {
+ 	struct mlist *ml;
+ 	int rv;
+ 	for (ml = ms->mlist->next; ml != ms->mlist; ml = ml->next)
+-		if ((rv = match(ms, ml->magic, ml->nmagic, buf, nbytes, mode)) != 0)
++		if ((rv = match(ms, ml->magic, ml->nmagic, buf, nbytes, mode, level)) != 0)
+ 			return rv;
+ 
+ 	return 0;
+@@ -106,7 +106,7 @@
+  */
+ private int
+ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
+-    const unsigned char *s, size_t nbytes, int mode)
++    const unsigned char *s, size_t nbytes, int mode, int recursion_level)
+ {
+ 	uint32_t magindex = 0;
+ 	unsigned int cont_level = 0;
+@@ -135,7 +135,7 @@
+ 		ms->line = m->lineno;
+ 
+ 		/* if main entry matches, print it... */
+-		switch (mget(ms, s, m, nbytes, cont_level)) {
++		switch (mget(ms, s, m, nbytes, cont_level, recursion_level + 1)) {
+ 		case -1:
+ 			return -1;
+ 		case 0:
+@@ -218,7 +218,7 @@
+ 					continue;
+ 			}
+ #endif
+-			switch (mget(ms, s, m, nbytes, cont_level)) {
++			switch (mget(ms, s, m, nbytes, cont_level, recursion_level + 1)) {
+ 			case -1:
+ 				return -1;
+ 			case 0:
+@@ -1025,12 +1025,17 @@
+ 
+ private int
+ mget(struct magic_set *ms, const unsigned char *s,
+-    struct magic *m, size_t nbytes, unsigned int cont_level)
++    struct magic *m, size_t nbytes, unsigned int cont_level, int recursion_level)
+ {
+ 	uint32_t offset = ms->offset;
+ 	uint32_t count = m->str_range;
+ 	union VALUETYPE *p = &ms->ms_value;
+ 
++        if (recursion_level >= 20) {
++                file_error(ms, 0, "recursion nesting exceeded");
++                return -1;
++        }
++
+ 	if (mcopy(ms, p, m->type, m->flag & INDIR, s, offset, nbytes, count) == -1)
+ 		return -1;
+ 
+@@ -1584,13 +1589,15 @@
+ 		break;
+ 
+ 	case FILE_INDIRECT:
++		if (offset == 0)
++			return 0;
+ 	  	if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
+ 		    file_printf(ms, m->desc) == -1)
+ 			return -1;
+ 		if (nbytes < offset)
+ 			return 0;
+ 		return file_softmagic(ms, s + offset, nbytes - offset,
+-		    BINTEST);
++		    recursion_level, BINTEST);
+ 
+ 	case FILE_DEFAULT:	/* nothing to check */
+ 	default:

debian/patches/series

@@ -83,3 +83,4 @@
 cdf-cert-bff-crashes
 cdf-restore-prefix
 cdf-word-detection
+CVE-2014-1943.patch