diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch | 35 | ||||
-rw-r--r-- | meta/recipes-devtools/patch/patch_2.7.6.bb | 4 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch b/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch new file mode 100644 index 0000000000..b0bd6fa83a --- /dev/null +++ b/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Gruenbacher <agruen@gnu.org> | ||
3 | Date: Mon, 12 Feb 2018 16:48:24 +0100 | ||
4 | Subject: [PATCH] Fix segfault with mangled rename patch | ||
5 | |||
6 | http://savannah.gnu.org/bugs/?53132 | ||
7 | * src/pch.c (intuit_diff_type): Ensure that two filenames are specified | ||
8 | for renames and copies (fix the existing check). | ||
9 | |||
10 | Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f290f48a621867084884bfff87f8093c15195e6a] | ||
11 | CVE: CVE-2018-6951 | ||
12 | |||
13 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
14 | |||
15 | --- | ||
16 | src/pch.c | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/pch.c b/src/pch.c | ||
20 | index ff9ed2c..bc6278c 100644 | ||
21 | --- a/src/pch.c | ||
22 | +++ b/src/pch.c | ||
23 | @@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) | ||
24 | if ((pch_rename () || pch_copy ()) | ||
25 | && ! inname | ||
26 | && ! ((i == OLD || i == NEW) && | ||
27 | - p_name[! reverse] && | ||
28 | + p_name[reverse] && p_name[! reverse] && | ||
29 | + name_is_valid (p_name[reverse]) && | ||
30 | name_is_valid (p_name[! reverse]))) | ||
31 | { | ||
32 | say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); | ||
33 | -- | ||
34 | 2.7.4 | ||
35 | |||
diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 576a2ac8fa..19ddf34981 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb | |||
@@ -1,7 +1,9 @@ | |||
1 | require patch.inc | 1 | require patch.inc |
2 | LICENSE = "GPLv3" | 2 | LICENSE = "GPLv3" |
3 | 3 | ||
4 | SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch" | 4 | SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ |
5 | file://0002-Fix-segfault-with-mangled-rename-patch.patch \ | ||
6 | " | ||
5 | 7 | ||
6 | SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" | 8 | SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" |
7 | SRC_URI[sha256sum] = "8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e" | 9 | SRC_URI[sha256sum] = "8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e" |