diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-28 10:55:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-28 10:55:56 +0000 |
| commit | 7bd0c0576da1e595f37c0bb70c0d286b78a62eb0 (patch) | |
| tree | 2e0cacaf5fcdea76fe5a2da8217a9ab13562c28a /meta/recipes-devtools/file | |
| parent | d9519a17ea2ca07433164697a7222dd2b6dd2b9a (diff) | |
| download | openembedded-core-contrib-7bd0c0576da1e595f37c0bb70c0d286b78a62eb0.tar.gz | |
Revert "file: Update CVE patch to ensure file gets built correctly"
This reverts commit d9519a17ea2ca07433164697a7222dd2b6dd2b9a.
Diffstat (limited to 'meta/recipes-devtools/file')
| -rw-r--r-- | meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch b/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch index 7b23975abf..2482de3998 100644 --- a/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch +++ b/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch @@ -16,9 +16,6 @@ https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c -[RP: Don't patch magic.h, only magic.h.in so that timestamps ensure -the file gets rebuilt] - Upstream-Status: Backport Signed-off-by: Chong Lu <Chong.Lu@windriver.com> @@ -31,6 +28,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> src/file_opts.h | 6 + src/funcs.c | 42 ++++- src/magic.c | 50 ++++++ + src/magic.h | 9 ++ src/magic.h.in | 9 ++ src/readelf.c | 471 +++++++++++++++++++++++++++++++++---------------------- src/softmagic.c | 93 ++++++----- @@ -425,6 +423,26 @@ index 22174b8..a89647c 100644 + return -1; + } +} +diff --git a/src/magic.h b/src/magic.h +index 535a177..89bfe4b 100644 +--- a/src/magic.h ++++ b/src/magic.h +@@ -101,6 +101,15 @@ int magic_check(magic_t, const char *); + int magic_list(magic_t, const char *); + int magic_errno(magic_t); + ++#define MAGIC_PARAM_INDIR_MAX 0 ++#define MAGIC_PARAM_NAME_MAX 1 ++#define MAGIC_PARAM_ELF_PHNUM_MAX 2 ++#define MAGIC_PARAM_ELF_SHNUM_MAX 3 ++#define MAGIC_PARAM_ELF_NOTES_MAX 4 ++ ++int magic_setparam(magic_t, int, const void *); ++int magic_getparam(magic_t, int, void *); ++ + #ifdef __cplusplus + }; + #endif diff --git a/src/magic.h.in b/src/magic.h.in index 86fc41b..2efc7bc 100644 --- a/src/magic.h.in |