Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=d0cb3b4e89cc0ecfc2f46af3afe206a352b9606b
commit d0cb3b4e89cc0ecfc2f46af3afe206a352b9606b Author: kikadf <[email protected]> Date: Sat Jul 19 09:03:57 2014 +0200 file-5.14-2arcturus3-x86_64 * Fix CVE-2013-7345, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479, * CVE-2014-3480, CVE-2014-3487, CVE-2014-3538 diff --git a/source/base/file/CVE-2013-7345.patch b/source/base/file/CVE-2013-7345.patch new file mode 100644 index 0000000..4ba8ed2 --- /dev/null +++ b/source/base/file/CVE-2013-7345.patch @@ -0,0 +1,26 @@ +From ef2329cf71acb59204dd981e2c6cce6c81fe467c Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Mon, 25 Mar 2013 14:06:55 +0000 +Subject: [PATCH] limit to 100 repetitions to avoid excessive backtracking + Carsten Wolff + +--- + magic/Magdir/commands | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/magic/Magdir/commands b/magic/Magdir/commands +index 67c3eee..4a7d8dd 100644 +--- a/magic/Magdir/commands ++++ b/magic/Magdir/commands +@@ -49,7 +49,7 @@ + !:mime text/x-awk + 0 string/wt #!\ /usr/bin/awk awk script text executable + !:mime text/x-awk +-0 regex =^\\s*BEGIN\\s*[{] awk script text ++0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text + + # AT&T Bell Labs' Plan 9 shell + 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable +-- +1.9.3 + diff --git a/source/base/file/CVE-2014-0207.patch b/source/base/file/CVE-2014-0207.patch new file mode 100644 index 0000000..bef397d --- /dev/null +++ b/source/base/file/CVE-2014-0207.patch @@ -0,0 +1,36 @@ +Part of: + +From 6d209c1c489457397a5763bca4b28e43aac90391 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Mon, 5 May 2014 16:11:21 +0000 +Subject: [PATCH] Apply patches from file-CVE-2012-1571.patch From Francisco + Alonso Espejo: file < 5.18/git version can be made to crash when checking + some corrupt CDF files (Using an invalid cdf_read_short_sector size) + The problem I found here, is that in most situations (if + h_short_sec_size_p2 > 8) because the blocksize is 512 and normal values + are 06 which means reading 64 bytes.As long as the check for the block + size copy is not checked properly (there's an assert that makes + wrong/invalid assumptions) + +--- + src/cdf.c | 6 +++--- + src/readcdf.c | 29 +++++++++++++++-------------- + 2 files changed, 18 insertions(+), 17 deletions(-) + +diff --git a/src/cdf.c b/src/cdf.c +index 2573a5f..f7c46ae 100644 +--- a/src/cdf.c ++++ b/src/cdf.c +@@ -352,10 +352,10 @@ cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs, + size_t ss = CDF_SHORT_SEC_SIZE(h); + size_t pos = CDF_SHORT_SEC_POS(h, id); + assert(ss == len); +- if (pos > CDF_SEC_SIZE(h) * sst->sst_len) { ++ if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) { + DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %" + SIZE_T_FORMAT "u\n", +- pos, CDF_SEC_SIZE(h) * sst->sst_len)); ++ pos + len, CDF_SEC_SIZE(h) * sst->sst_len)); + return -1; + } + (void)memcpy(((char *)buf) + offs, diff --git a/source/base/file/CVE-2014-3478.patch b/source/base/file/CVE-2014-3478.patch new file mode 100644 index 0000000..99b176e --- /dev/null +++ b/source/base/file/CVE-2014-3478.patch @@ -0,0 +1,36 @@ +From 27a14bc7ba285a0a5ebfdb55e54001aa11932b08 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Wed, 4 Jun 2014 17:36:34 +0000 +Subject: [PATCH] Correctly compute the truncated pascal string size (Francisco + Alonso and Jan Kaluza at RedHat) + +--- + src/softmagic.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +Index: file-5.14/src/softmagic.c +=================================================================== +--- file-5.14.orig/src/softmagic.c 2014-07-10 09:28:14.446565969 -0400 ++++ file-5.14/src/softmagic.c 2014-07-10 09:28:14.442565969 -0400 +@@ -897,10 +897,18 @@ + return 1; + } + case FILE_PSTRING: { +- char *ptr1 = p->s, *ptr2 = ptr1 + file_pstring_length_size(m); ++ size_t sz = file_pstring_length_size(m); ++ char *ptr1 = p->s, *ptr2 = ptr1 + sz; + size_t len = file_pstring_get_length(m, ptr1); +- if (len >= sizeof(p->s)) +- len = sizeof(p->s) - 1; ++ if (len >= sizeof(p->s)) { ++ /* ++ * The size of the pascal string length (sz) ++ * is 1, 2, or 4. We need at least 1 byte for NUL ++ * termination, but we've already truncated the ++ * string by p->s, so we need to deduct sz. ++ */ ++ len = sizeof(p->s) - sz; ++ } + while (len--) + *ptr1++ = *ptr2++; + *ptr1 = '\0'; diff --git a/source/base/file/CVE-2014-3479.patch b/source/base/file/CVE-2014-3479.patch new file mode 100644 index 0000000..7ac6983 --- /dev/null +++ b/source/base/file/CVE-2014-3479.patch @@ -0,0 +1,35 @@ +From 36fadd29849b8087af9f4586f89dbf74ea45be67 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Wed, 4 Jun 2014 17:26:07 +0000 +Subject: [PATCH] Use the proper sector size when checking stream offsets + (Francisco Alonso and Jan Kaluza at RedHat) + +--- + src/cdf.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/cdf.c b/src/cdf.c +index 6652581..0bfb31a 100644 +--- a/src/cdf.c ++++ b/src/cdf.c +@@ -267,13 +267,15 @@ cdf_check_stream_offset(const cdf_stream_t *sst, const cdf_header_t *h, + { + const char *b = (const char *)sst->sst_tab; + const char *e = ((const char *)p) + tail; ++ size_t ss = sst->sst_dirlen < h->h_min_size_standard_stream ? ++ CDF_SHORT_SEC_SIZE(h) : CDF_SEC_SIZE(h); + (void)&line; +- if (e >= b && (size_t)(e - b) <= CDF_SEC_SIZE(h) * sst->sst_len) ++ if (e >= b && (size_t)(e - b) <= ss * sst->sst_len) + return 0; + DPRINTF(("%d: offset begin %p < end %p || %" SIZE_T_FORMAT "u" + " > %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %" + SIZE_T_FORMAT "u]\n", line, b, e, (size_t)(e - b), +- CDF_SEC_SIZE(h) * sst->sst_len, CDF_SEC_SIZE(h), sst->sst_len)); ++ ss * sst->sst_len, ss, sst->sst_len)); + errno = EFTYPE; + return -1; + } +-- +1.9.3 + diff --git a/source/base/file/CVE-2014-3480.patch b/source/base/file/CVE-2014-3480.patch new file mode 100644 index 0000000..3c4126a --- /dev/null +++ b/source/base/file/CVE-2014-3480.patch @@ -0,0 +1,35 @@ +From 40bade80cbe2af1d0b2cd0420cebd5d5905a2382 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Wed, 4 Jun 2014 17:23:19 +0000 +Subject: [PATCH] Fix incorrect bounds check for sector count. (Francisco + Alonso and Jan Kaluza at RedHat) + +--- + src/cdf.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +Index: file-5.14/src/cdf.c +=================================================================== +--- file-5.14.orig/src/cdf.c 2014-07-10 09:28:35.754565639 -0400 ++++ file-5.14/src/cdf.c 2014-07-10 09:28:35.750565639 -0400 +@@ -457,7 +457,8 @@ + cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size) + { + size_t i, j; +- cdf_secid_t maxsector = (cdf_secid_t)(sat->sat_len * size); ++ cdf_secid_t maxsector = (cdf_secid_t)((sat->sat_len * size) ++ / sizeof(maxsector)); + + DPRINTF(("Chain:")); + for (j = i = 0; sid >= 0; i++, j++) { +@@ -467,8 +468,8 @@ + errno = EFTYPE; + return (size_t)-1; + } +- if (sid > maxsector) { +- DPRINTF(("Sector %d > %d\n", sid, maxsector)); ++ if (sid >= maxsector) { ++ DPRINTF(("Sector %d >= %d\n", sid, maxsector)); + errno = EFTYPE; + return (size_t)-1; + } diff --git a/source/base/file/CVE-2014-3487.patch b/source/base/file/CVE-2014-3487.patch new file mode 100644 index 0000000..5ca6bd4 --- /dev/null +++ b/source/base/file/CVE-2014-3487.patch @@ -0,0 +1,27 @@ +From 93e063ee374b6a75729df9e7201fb511e47e259d Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Mon, 9 Jun 2014 13:04:37 +0000 +Subject: [PATCH] Add missing check offset test (Francisco Alonso, Jan Kaluza + at RedHat) + +--- + src/cdf.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: file-5.14/src/cdf.c +=================================================================== +--- file-5.14.orig/src/cdf.c 2014-07-10 09:28:51.894565389 -0400 ++++ file-5.14/src/cdf.c 2014-07-10 09:28:51.890565389 -0400 +@@ -799,7 +799,11 @@ + if (cdf_check_stream_offset(sst, h, e, 0, __LINE__) == -1) + goto out; + for (i = 0; i < sh.sh_properties; i++) { +- size_t ofs = CDF_GETUINT32(p, (i << 1) + 1); ++ size_t tail = (i << 1) + 1; ++ if (cdf_check_stream_offset(sst, h, p, tail * sizeof(uint32_t), ++ __LINE__) == -1) ++ goto out; ++ size_t ofs = CDF_GETUINT32(p, tail); + q = (const uint8_t *)(const void *) + ((const char *)(const void *)p + ofs + - 2 * sizeof(uint32_t)); diff --git a/source/base/file/CVE-2014-3538.patch b/source/base/file/CVE-2014-3538.patch new file mode 100644 index 0000000..a42c540 --- /dev/null +++ b/source/base/file/CVE-2014-3538.patch @@ -0,0 +1,428 @@ +Description: fix denial of service via awk rule backtracking +Origin: upstream, https://github.com/file/file/commit/758e066df72fb1ac08d2eea91ddc3973d259e991 +Origin: upstream, https://github.com/file/file/commit/74cafd7de9ec99a14f4480927580e501c8f852c3 +Origin: upstream, https://github.com/file/file/commit/71a8b6c0d758acb0f73e2e51421a711b5e9d6668 +Origin: upstream, https://github.com/file/file/commit/69a5a43b3b71f53b0577f41264a073f495799610 +Origin: upstream, https://github.com/file/file/commit/4a284c89d6ef11aca34da65da7d673050a5ea320 + +Index: file-5.14/doc/magic.man +=================================================================== +--- file-5.14.orig/doc/magic.man 2014-07-10 09:40:50.000000000 -0400 ++++ file-5.14/doc/magic.man 2014-07-10 10:05:33.346531281 -0400 +@@ -228,13 +228,25 @@ + performance is hard to predict, so their use is discouraged. + When used in production environments, their performance + should be carefully checked. +-The type specification can be optionally followed by +-.Dv /[c][s] . ++The size of the string to search should also be limited by specifying ++.Dv /<length> , ++to avoid performance issues scanning long files. ++The type specification can also be optionally followed by ++.Dv /[c][s][l] . + The + .Dq c + flag makes the match case insensitive, while the + .Dq s + flag update the offset to the start offset of the match, rather than the end. ++The ++.Dq l ++modifier, changes the limit of length to mean number of lines instead of a ++byte count. ++Lines are delimited by the platforms native line delimiter. ++When a line count is specified, an implicit byte count also computed assuming ++each line is 80 characters long. ++If neither a byte or line count is specified, the search is limited automatically ++to 8KiB. + The regular expression is tested against line + .Dv N + 1 + onwards, where +@@ -401,6 +413,9 @@ + .Dv 0x13 + is hexadecimal. + .Pp ++Numeric operations are not performed on date types, instead the numeric ++value is interpreted as an offset. ++.Pp + For string values, the string from the + file must match the specified string. + The operators +Index: file-5.14/magic/Magdir/commands +=================================================================== +--- file-5.14.orig/magic/Magdir/commands 2014-07-10 09:57:12.618539039 -0400 ++++ file-5.14/magic/Magdir/commands 2014-07-10 09:59:10.014537220 -0400 +@@ -49,7 +49,7 @@ + !:mime text/x-awk + 0 string/wt #!\ /usr/bin/awk awk script text executable + !:mime text/x-awk +-0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text ++0 regex/4096 =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text + + # AT&T Bell Labs' Plan 9 shell + 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable +Index: file-5.14/magic/Magdir/fortran +=================================================================== +--- file-5.14.orig/magic/Magdir/fortran 2012-10-31 13:16:48.000000000 -0400 ++++ file-5.14/magic/Magdir/fortran 2014-07-10 10:00:07.362536332 -0400 +@@ -2,6 +2,6 @@ + #------------------------------------------------------------------------------ + # $File: fortran,v 1.7 2012/06/21 01:55:02 christos Exp $ + # FORTRAN source +-0 regex/100 \^[Cc][\ \t] FORTRAN program ++0 regex/100l \^[Cc][\ \t] FORTRAN program + !:mime text/x-fortran + !:strength - 5 +Index: file-5.14/magic/Magdir/graphviz +=================================================================== +--- file-5.14.orig/magic/Magdir/graphviz 2010-03-16 11:33:38.000000000 -0400 ++++ file-5.14/magic/Magdir/graphviz 2014-07-10 10:00:26.142536041 -0400 +@@ -6,7 +6,7 @@ + # FIXME: These patterns match too generally. For example, the first + # line matches a LaTeX file containing the word "graph" (with a { + # following later) and the second line matches this file. +-#0 regex/100 [\r\n\t\ ]*graph[\r\n\t\ ]+.*\\{ graphviz graph text ++#0 regex/100l [\r\n\t\ ]*graph[\r\n\t\ ]+.*\\{ graphviz graph text + #!:mime text/vnd.graphviz +-#0 regex/100 [\r\n\t\ ]*digraph[\r\n\t\ ]+.*\\{ graphviz digraph text ++#0 regex/100l [\r\n\t\ ]*digraph[\r\n\t\ ]+.*\\{ graphviz digraph text + #!:mime text/vnd.graphviz +Index: file-5.14/magic/Magdir/marc21 +=================================================================== +--- file-5.14.orig/magic/Magdir/marc21 2014-07-10 09:40:50.000000000 -0400 ++++ file-5.14/magic/Magdir/marc21 2014-07-10 09:59:25.842536975 -0400 +@@ -12,17 +12,17 @@ + 20 string 45 + + # leader starts with 5 digits, followed by codes specific to MARC format +->0 regex/1 (^[0-9]{5})[acdnp][^bhlnqsu-z] MARC21 Bibliographic ++>0 regex/1l (^[0-9]{5})[acdnp][^bhlnqsu-z] MARC21 Bibliographic + !:mime application/marc +->0 regex/1 (^[0-9]{5})[acdnosx][z] MARC21 Authority ++>0 regex/1l (^[0-9]{5})[acdnosx][z] MARC21 Authority + !:mime application/marc +->0 regex/1 (^[0-9]{5})[cdn][uvxy] MARC21 Holdings ++>0 regex/1l (^[0-9]{5})[cdn][uvxy] MARC21 Holdings + !:mime application/marc +-0 regex/1 (^[0-9]{5})[acdn][w] MARC21 Classification ++0 regex/1l (^[0-9]{5})[acdn][w] MARC21 Classification + !:mime application/marc +->0 regex/1 (^[0-9]{5})[cdn][q] MARC21 Community ++>0 regex/1l (^[0-9]{5})[cdn][q] MARC21 Community + !:mime application/marc + + # leader position 22-23, should be "00" but is it? +->0 regex/1 (^.{21})([^0]{2}) (non-conforming) ++>0 regex/1l (^.{21})([^0]{2}) (non-conforming) + !:mime application/marc +Index: file-5.14/magic/Magdir/scientific +=================================================================== +--- file-5.14.orig/magic/Magdir/scientific 2014-07-10 09:57:12.446539042 -0400 ++++ file-5.14/magic/Magdir/scientific 2014-07-10 09:59:25.842536975 -0400 +@@ -91,12 +91,12 @@ + # uppercase letters. However, examples have been seen without the date string, + # e.g., the example on the chemime site. + 0 string HEADER\ \ \ \ +->&0 regex/1 \^.{40} +->>&0 regex/1 [0-9]{2}-[A-Z]{3}-[0-9]{2}\ {3} +->>>&0 regex/1s [A-Z0-9]{4}.{14}$ +->>>>&0 regex/1 [A-Z0-9]{4} Protein Data Bank data, ID Code %s ++>&0 regex/1l \^.{40} ++>>&0 regex/1l [0-9]{2}-[A-Z]{3}-[0-9]{2}\ {3} ++>>>&0 regex/1ls [A-Z0-9]{4}.{14}$ ++>>>>&0 regex/1l [A-Z0-9]{4} Protein Data Bank data, ID Code %s + !:mime chemical/x-pdb +->>>>0 regex/1 [0-9]{2}-[A-Z]{3}-[0-9]{2} \b, %s ++>>>>0 regex/1l [0-9]{2}-[A-Z]{3}-[0-9]{2} \b, %s + + # Type: GDSII Stream file + 0 belong 0x00060002 GDSII Stream file +Index: file-5.14/magic/Magdir/troff +=================================================================== +--- file-5.14.orig/magic/Magdir/troff 2014-07-10 09:40:50.000000000 -0400 ++++ file-5.14/magic/Magdir/troff 2014-07-10 09:59:25.842536975 -0400 +@@ -16,9 +16,9 @@ + !:mime text/troff + 0 search/1 ''' troff or preprocessor input text + !:mime text/troff +-0 regex/20 \^\\.[A-Za-z0-9][A-Za-z0-9][\ \t] troff or preprocessor input text ++0 regex/20l \^\\.[A-Za-z0-9][A-Za-z0-9][\ \t] troff or preprocessor input text + !:mime text/troff +-0 regex/20 \^\\.[A-Za-z0-9][A-Za-z0-9]$ troff or preprocessor input text ++0 regex/20l \^\\.[A-Za-z0-9][A-Za-z0-9]$ troff or preprocessor input text + !:mime text/troff + + # ditroff intermediate output text +Index: file-5.14/src/apprentice.c +=================================================================== +--- file-5.14.orig/src/apprentice.c 2014-07-10 09:57:12.482539041 -0400 ++++ file-5.14/src/apprentice.c 2014-07-10 09:59:25.846536975 -0400 +@@ -1307,7 +1307,8 @@ + if ((ms->flags & MAGIC_CHECK) == 0) + return 0; + +- if (m->type != FILE_PSTRING && (m->str_flags & PSTRING_LEN) != 0) { ++ if ((m->type != FILE_REGEX || (m->str_flags & REGEX_LINE_COUNT) == 0) && ++ (m->type != FILE_PSTRING && (m->str_flags & PSTRING_LEN) != 0)) { + file_magwarn(ms, + "'/BHhLl' modifiers are only allowed for pascal strings\n"); + return -1; +@@ -1800,8 +1801,13 @@ + m->str_flags = (m->str_flags & ~PSTRING_LEN) | PSTRING_4_BE; + break; + case CHAR_PSTRING_4_LE: +- if (m->type != FILE_PSTRING) ++ switch (m->type) { ++ case FILE_PSTRING: ++ case FILE_REGEX: ++ break; ++ default: + goto bad; ++ } + m->str_flags = (m->str_flags & ~PSTRING_LEN) | PSTRING_4_LE; + break; + case CHAR_PSTRING_LENGTH_INCLUDES_ITSELF: +Index: file-5.14/src/file.h +=================================================================== +--- file-5.14.orig/src/file.h 2014-07-10 09:57:12.550539040 -0400 ++++ file-5.14/src/file.h 2014-07-10 09:59:25.846536975 -0400 +@@ -321,6 +321,7 @@ + #define PSTRING_2_LE BIT(9) + #define PSTRING_4_BE BIT(10) + #define PSTRING_4_LE BIT(11) ++#define REGEX_LINE_COUNT BIT(11) + #define PSTRING_LEN \ + (PSTRING_1_BE|PSTRING_2_LE|PSTRING_2_BE|PSTRING_4_LE|PSTRING_4_BE) + #define PSTRING_LENGTH_INCLUDES_ITSELF BIT(12) +Index: file-5.14/src/softmagic.c +=================================================================== +--- file-5.14.orig/src/softmagic.c 2014-07-10 09:57:12.682539038 -0400 ++++ file-5.14/src/softmagic.c 2014-07-10 10:03:46.490532937 -0400 +@@ -53,7 +53,7 @@ + private int32_t moffset(struct magic_set *, struct magic *); + private void mdebug(uint32_t, const char *, size_t); + private int mcopy(struct magic_set *, union VALUETYPE *, int, int, +- const unsigned char *, uint32_t, size_t, size_t); ++ const unsigned char *, uint32_t, size_t, struct magic *); + private int mconvert(struct magic_set *, struct magic *, int); + private int print_sep(struct magic_set *, int); + private int handle_annotation(struct magic_set *, struct magic *); +@@ -499,7 +499,7 @@ + case FILE_BEDATE: + case FILE_LEDATE: + case FILE_MEDATE: +- if (file_printf(ms, m->desc, file_fmttime(p->l, FILE_T_LOCAL, ++ if (file_printf(ms, m->desc, file_fmttime(p->l + m->num_mask, FILE_T_LOCAL, + tbuf)) == -1) + return -1; + t = ms->offset + sizeof(uint32_t); +@@ -509,7 +509,7 @@ + case FILE_BELDATE: + case FILE_LELDATE: + case FILE_MELDATE: +- if (file_printf(ms, m->desc, file_fmttime(p->l, 0, tbuf)) == -1) ++ if (file_printf(ms, m->desc, file_fmttime(p->l + m->num_mask, 0, tbuf)) == -1) + return -1; + t = ms->offset + sizeof(uint32_t); + break; +@@ -517,7 +517,7 @@ + case FILE_QDATE: + case FILE_BEQDATE: + case FILE_LEQDATE: +- if (file_printf(ms, m->desc, file_fmttime(p->q, FILE_T_LOCAL, ++ if (file_printf(ms, m->desc, file_fmttime(p->q + m->num_mask, FILE_T_LOCAL, + tbuf)) == -1) + return -1; + t = ms->offset + sizeof(uint64_t); +@@ -526,7 +526,7 @@ + case FILE_QLDATE: + case FILE_BEQLDATE: + case FILE_LEQLDATE: +- if (file_printf(ms, m->desc, file_fmttime(p->q, 0, tbuf)) == -1) ++ if (file_printf(ms, m->desc, file_fmttime(p->q + m->num_mask, 0, tbuf)) == -1) + return -1; + t = ms->offset + sizeof(uint64_t); + break; +@@ -534,7 +534,7 @@ + case FILE_QWDATE: + case FILE_BEQWDATE: + case FILE_LEQWDATE: +- if (file_printf(ms, m->desc, file_fmttime(p->q, FILE_T_WINDOWS, ++ if (file_printf(ms, m->desc, file_fmttime(p->q + m->num_mask, FILE_T_WINDOWS, + tbuf)) == -1) + return -1; + t = ms->offset + sizeof(uint64_t); +@@ -870,8 +870,9 @@ + mconvert(struct magic_set *ms, struct magic *m, int flip) + { + union VALUETYPE *p = &ms->ms_value; ++ uint8_t type; + +- switch (cvt_flip(m->type, flip)) { ++ switch (type = cvt_flip(m->type, flip)) { + case FILE_BYTE: + cvt_8(p, m); + return 1; +@@ -923,7 +924,8 @@ + case FILE_BELDATE: + p->l = (int32_t) + ((p->hl[0]<<24)|(p->hl[1]<<16)|(p->hl[2]<<8)|(p->hl[3])); +- cvt_32(p, m); ++ if (type == FILE_BELONG) ++ cvt_32(p, m); + return 1; + case FILE_BEQUAD: + case FILE_BEQDATE: +@@ -934,7 +936,8 @@ + ((uint64_t)p->hq[2]<<40)|((uint64_t)p->hq[3]<<32)| + ((uint64_t)p->hq[4]<<24)|((uint64_t)p->hq[5]<<16)| + ((uint64_t)p->hq[6]<<8)|((uint64_t)p->hq[7])); +- cvt_64(p, m); ++ if (type == FILE_BEQUAD) ++ cvt_64(p, m); + return 1; + case FILE_LESHORT: + p->h = (short)((p->hs[1]<<8)|(p->hs[0])); +@@ -945,7 +948,8 @@ + case FILE_LELDATE: + p->l = (int32_t) + ((p->hl[3]<<24)|(p->hl[2]<<16)|(p->hl[1]<<8)|(p->hl[0])); +- cvt_32(p, m); ++ if (type == FILE_LELONG) ++ cvt_32(p, m); + return 1; + case FILE_LEQUAD: + case FILE_LEQDATE: +@@ -956,14 +960,16 @@ + ((uint64_t)p->hq[5]<<40)|((uint64_t)p->hq[4]<<32)| + ((uint64_t)p->hq[3]<<24)|((uint64_t)p->hq[2]<<16)| + ((uint64_t)p->hq[1]<<8)|((uint64_t)p->hq[0])); +- cvt_64(p, m); ++ if (type == FILE_LEQUAD) ++ cvt_64(p, m); + return 1; + case FILE_MELONG: + case FILE_MEDATE: + case FILE_MELDATE: + p->l = (int32_t) + ((p->hl[1]<<24)|(p->hl[0]<<16)|(p->hl[3]<<8)|(p->hl[2])); +- cvt_32(p, m); ++ if (type == FILE_MELONG) ++ cvt_32(p, m); + return 1; + case FILE_FLOAT: + cvt_float(p, m); +@@ -1019,7 +1025,7 @@ + + private int + mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir, +- const unsigned char *s, uint32_t offset, size_t nbytes, size_t linecnt) ++ const unsigned char *s, uint32_t offset, size_t nbytes, struct magic *m) + { + /* + * Note: FILE_SEARCH and FILE_REGEX do not actually copy +@@ -1039,15 +1045,29 @@ + const char *last; /* end of search region */ + const char *buf; /* start of search region */ + const char *end; +- size_t lines; ++ size_t lines, linecnt, bytecnt; + + if (s == NULL) { + ms->search.s_len = 0; + ms->search.s = NULL; + return 0; + } ++ ++ if (m->str_flags & REGEX_LINE_COUNT) { ++ linecnt = m->str_range; ++ bytecnt = linecnt * 80; ++ } else { ++ linecnt = 0; ++ bytecnt = m->str_range; ++ } ++ ++ if (bytecnt == 0) ++ bytecnt = 8192; ++ if (bytecnt > nbytes) ++ bytecnt = nbytes; ++ + buf = RCAST(const char *, s) + offset; +- end = last = RCAST(const char *, s) + nbytes; ++ end = last = RCAST(const char *, s) + bytecnt; + /* mget() guarantees buf <= last */ + for (lines = linecnt, b = buf; lines && b < end && + ((b = CAST(const char *, +@@ -1060,7 +1080,7 @@ + b++; + } + if (lines) +- last = RCAST(const char *, s) + nbytes; ++ last = RCAST(const char *, s) + bytecnt; + + ms->search.s = buf; + ms->search.s_len = last - buf; +@@ -1134,7 +1154,6 @@ + int *need_separator, int *returnval) + { + uint32_t soffset, offset = ms->offset; +- uint32_t count = m->str_range; + int rv, oneed_separator; + char *sbuf, *rbuf; + union VALUETYPE *p = &ms->ms_value; +@@ -1146,13 +1165,12 @@ + } + + if (mcopy(ms, p, m->type, m->flag & INDIR, s, (uint32_t)(offset + o), +- (uint32_t)nbytes, count) == -1) ++ (uint32_t)nbytes, m) == -1) + return -1; + + if ((ms->flags & MAGIC_DEBUG) != 0) { + fprintf(stderr, "mget(type=%d, flag=%x, offset=%u, o=%zu, " +- "nbytes=%zu, count=%u)\n", m->type, m->flag, offset, o, +- nbytes, count); ++ "nbytes=%zu)\n", m->type, m->flag, offset, o, nbytes); + mdebug(offset, (char *)(void *)p, sizeof(union VALUETYPE)); + #ifndef COMPILE_ONLY + file_mdump(m); +@@ -1646,7 +1664,7 @@ + if ((ms->flags & MAGIC_DEBUG) != 0) + fprintf(stderr, "indirect +offs=%u\n", offset); + } +- if (mcopy(ms, p, m->type, 0, s, offset, nbytes, count) == -1) ++ if (mcopy(ms, p, m->type, 0, s, offset, nbytes, m) == -1) + return -1; + ms->offset = offset; + +@@ -2002,7 +2020,8 @@ + if (slen + idx > ms->search.s_len) + break; + +- v = file_strncmp(m->value.s, ms->search.s + idx, slen, m->str_flags); ++ v = file_strncmp(m->value.s, ms->search.s + idx, slen, ++ m->str_flags); + if (v == 0) { /* found match */ + ms->search.offset += idx; + break; +@@ -2030,14 +2049,17 @@ + } + else { + regmatch_t pmatch[1]; ++ size_t slen = ms->search.s_len; + #ifndef REG_STARTEND + #define REG_STARTEND 0 +- size_t l = ms->search.s_len - 1; +- char c = ms->search.s[l]; +- ((char *)(intptr_t)ms->search.s)[l] = '\0'; ++ char c; ++ if (slen != 0) ++ slen--; ++ c = ms->search.s[slen]; ++ ((char *)(intptr_t)ms->search.s)[slen] = '\0'; + #else + pmatch[0].rm_so = 0; +- pmatch[0].rm_eo = ms->search.s_len; ++ pmatch[0].rm_eo = slen; + #endif + rc = regexec(&rx, (const char *)ms->search.s, + 1, pmatch, REG_STARTEND); diff --git a/source/base/file/FrugalBuild b/source/base/file/FrugalBuild index 9bb8e6d..9b5913f 100644 --- a/source/base/file/FrugalBuild +++ b/source/base/file/FrugalBuild @@ -6,7 +6,7 @@ options+=('asneeded') pkgname=file pkgver=5.14 -pkgrel=2arcturus2 +pkgrel=2arcturus3 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/"; depends=('glibc>=2.8-3' 'zlib>=1.2.3-6') @@ -17,9 +17,18 @@ source=(ftp://ftp.astron.com/pub/file/$pkgname-$pkgver.tar.gz) sha1sums=('064c8f17a5f7ae1e336a9285131e046d3b2d04d7') # FSA fix *** -source=(${source[@]} CVE-2014-1943.patch CVE-2014-2270.patch) +source=(${source[@]} CVE-2014-1943.patch CVE-2014-2270.patch CVE-2013-7345.patch + CVE-2014-0207.patch CVE-2014-3478.patch CVE-2014-3479.patch + CVE-2014-3480.patch CVE-2014-3487.patch CVE-2014-3538.patch) sha1sums=(${sha1sums[@]} 'f8a3696fde7435dd431e4ac75cfc8629cb34725a' \ - '6737050b7aff65c1dc1ff526be30e0d75a3cfaa6') + '6737050b7aff65c1dc1ff526be30e0d75a3cfaa6' \ + '140369d478fba2ac770858dcc49fb6e06211026e' \ + '3054c0db9982aa29e20b71dd550761be075daa3b' \ + 'd93a4f12a7fbd8ed79c44f7394a9e0198579e384' \ + 'fe1f00a3937fc1564bbf471df2048bf036cc24ff' \ + '6bed490442e7c12d2e1f0dc79d744395aed5f0e5' \ + 'c03c4373c91fba10083837acec4573a489966ebc' \ + 'a71644bb937cd3e944e02f31e4c8b42f66b4a0b8') # *********** build() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
