diff options
| author | Russell Senior <russell@personaltelco.net> | 2018-10-14 02:34:32 -0700 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 17:22:06 +0100 |
| commit | ed32045bcc645e15b5e9f44061efa218024d5137 (patch) | |
| tree | 9470914724e9432b44195270f440e9609a44db6b /tools/patch/patches/020-CVE-2018-6952.patch | |
| parent | ab64f9da81c72cad4ca88c0af1e3a7ba0fa7685c (diff) | |
| download | upstream-ed32045bcc645e15b5e9f44061efa218024d5137.tar.gz upstream-ed32045bcc645e15b5e9f44061efa218024d5137.tar.bz2 upstream-ed32045bcc645e15b5e9f44061efa218024d5137.zip | |
patch: apply upstream cve fixes
Apply two upstream patches to address two CVEs:
* CVE-2018-1000156
* CVE-2018-6952
Add PKG_CPE_ID to Makefile.
Build tested on apm821xx and ar71xx.
Signed-off-by: Russell Senior <russell@personaltelco.net>
(backported from 4797dddfde6a8ffdbdcb4e5b5e137b0a00313f62)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'tools/patch/patches/020-CVE-2018-6952.patch')
| -rw-r--r-- | tools/patch/patches/020-CVE-2018-6952.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tools/patch/patches/020-CVE-2018-6952.patch b/tools/patch/patches/020-CVE-2018-6952.patch new file mode 100644 index 0000000000..e72a8cbc27 --- /dev/null +++ b/tools/patch/patches/020-CVE-2018-6952.patch @@ -0,0 +1,25 @@ +From daa51e492049d9fe3ac049165ec19641bf19cd7f Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Fri, 17 Aug 2018 13:35:40 +0200 +Subject: [PATCH] Fix swapping fake lines in pch_swap + +* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a +blank line in the middle of a context-diff hunk: that empty line stays +in the middle of the hunk and isn't swapped. + +Fixes: https://savannah.gnu.org/bugs/index.php?53133 +--- + src/pch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/pch.c ++++ b/src/pch.c +@@ -2114,7 +2114,7 @@ pch_swap (void) + } + if (p_efake >= 0) { /* fix non-freeable ptr range */ + if (p_efake <= i) +- n = p_end - i + 1; ++ n = p_end - p_ptrn_lines; + else + n = -i; + p_efake += n; |