[arch-commits] Commit in patch/trunk (3 files)

Jelle van der Waa jelle at archlinux.org
Fri Nov 9 23:45:37 UTC 2018


    Date: Friday, November 9, 2018 @ 23:45:37
  Author: jelle
Revision: 338800

upgpkg: patch 2.7.6-4

Really apply CVE-2018-6952, CVE-2018-1000156 patches.

Added:
  patch/trunk/CVE-2018-1000156.patch
  patch/trunk/CVE-2018-6952.patch
Modified:
  patch/trunk/PKGBUILD

------------------------+
 CVE-2018-1000156.patch |  139 +++++++++++++++++++++++++++++++++++++++++++++++
 CVE-2018-6952.patch    |   27 +++++++++
 PKGBUILD               |   27 +++------
 3 files changed, 175 insertions(+), 18 deletions(-)

Added: CVE-2018-1000156.patch
===================================================================
--- CVE-2018-1000156.patch	                        (rev 0)
+++ CVE-2018-1000156.patch	2018-11-09 23:45:37 UTC (rev 338800)
@@ -0,0 +1,139 @@
+diff -aur patch-2.7.6/src/pch.c patch-2.7.6.new/src/pch.c
+--- patch-2.7.6/src/pch.c	2018-11-10 00:23:17.246869764 +0100
++++ patch-2.7.6.new/src/pch.c	2018-11-10 00:23:44.473430414 +0100
+@@ -33,6 +33,7 @@
+ # include <io.h>
+ #endif
+ #include <safe.h>
++#include <sys/wait.h>
+ 
+ #define INITHUNKMAX 125			/* initial dynamic allocation size */
+ 
+@@ -2389,22 +2390,28 @@
+     static char const editor_program[] = EDITOR_PROGRAM;
+ 
+     file_offset beginning_of_this_line;
+-    FILE *pipefp = 0;
+     size_t chars_read;
++    FILE *tmpfp = 0;
++    char const *tmpname;
++    int tmpfd;
++    pid_t pid;
++
++    if (! dry_run && ! skip_rest_of_patch)
++      {
++	/* Write ed script to a temporary file.  This causes ed to abort on
++	   invalid commands such as when line numbers or ranges exceed the
++	   number of available lines.  When ed reads from a pipe, it rejects
++	   invalid commands and treats the next line as a new command, which
++	   can lead to arbitrary command execution.  */
++
++	tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0);
++	if (tmpfd == -1)
++	  pfatal ("Can't create temporary file %s", quotearg (tmpname));
++	tmpfp = fdopen (tmpfd, "w+b");
++	if (! tmpfp)
++	  pfatal ("Can't open stream for file %s", quotearg (tmpname));
++      }
+ 
+-    if (! dry_run && ! skip_rest_of_patch) {
+-	int exclusive = *outname_needs_removal ? 0 : O_EXCL;
+-	assert (! inerrno);
+-	*outname_needs_removal = true;
+-	copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
+-	sprintf (buf, "%s %s%s", editor_program,
+-		 verbosity == VERBOSE ? "" : "- ",
+-		 outname);
+-	fflush (stdout);
+-	pipefp = popen(buf, binary_transput ? "wb" : "w");
+-	if (!pipefp)
+-	  pfatal ("Can't open pipe to %s", quotearg (buf));
+-    }
+     for (;;) {
+ 	char ed_command_letter;
+ 	beginning_of_this_line = file_tell (pfp);
+@@ -2415,14 +2422,14 @@
+ 	}
+ 	ed_command_letter = get_ed_command_letter (buf);
+ 	if (ed_command_letter) {
+-	    if (pipefp)
+-		if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
++	    if (tmpfp)
++		if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
+ 		    write_fatal ();
+ 	    if (ed_command_letter != 'd' && ed_command_letter != 's') {
+ 	        p_pass_comments_through = true;
+ 		while ((chars_read = get_line ()) != 0) {
+-		    if (pipefp)
+-			if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
++		    if (tmpfp)
++			if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
+ 			    write_fatal ();
+ 		    if (chars_read == 2  &&  strEQ (buf, ".\n"))
+ 			break;
+@@ -2435,13 +2442,49 @@
+ 	    break;
+ 	}
+     }
+-    if (!pipefp)
++    if (!tmpfp)
+       return;
+-    if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0
+-	|| fflush (pipefp) != 0)
++    if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0
++	|| fflush (tmpfp) != 0)
+       write_fatal ();
+-    if (pclose (pipefp) != 0)
+-      fatal ("%s FAILED", editor_program);
++
++    if (lseek (tmpfd, 0, SEEK_SET) == -1)
++      pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname));
++
++    if (! dry_run && ! skip_rest_of_patch) {
++	int exclusive = *outname_needs_removal ? 0 : O_EXCL;
++	*outname_needs_removal = true;
++	if (inerrno != ENOENT)
++	  {
++	    *outname_needs_removal = true;
++	    copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
++	  }
++	sprintf (buf, "%s %s%s", editor_program,
++		 verbosity == VERBOSE ? "" : "- ",
++		 outname);
++	fflush (stdout);
++
++	pid = fork();
++	if (pid == -1)
++	  pfatal ("Can't fork");
++	else if (pid == 0)
++	  {
++	    dup2 (tmpfd, 0);
++	    execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
++	    _exit (2);
++	  }
++	else
++	  {
++	    int wstatus;
++	    if (waitpid (pid, &wstatus, 0) == -1
++	        || ! WIFEXITED (wstatus)
++		|| WEXITSTATUS (wstatus) != 0)
++	      fatal ("%s FAILED", editor_program);
++	  }
++    }
++
++    fclose (tmpfp);
++    safe_unlink (tmpname);
+ 
+     if (ofp)
+       {
+diff -aur patch-2.7.6/tests/Makefile.am patch-2.7.6.new/tests/Makefile.am
+--- patch-2.7.6/tests/Makefile.am	2018-02-03 13:41:49.000000000 +0100
++++ patch-2.7.6.new/tests/Makefile.am	2018-11-10 00:23:44.473430414 +0100
+@@ -32,6 +32,7 @@
+ 	crlf-handling \
+ 	dash-o-append \
+ 	deep-directories \
++	ed-style \
+ 	empty-files \
+ 	false-match \
+ 	fifo \

Added: CVE-2018-6952.patch
===================================================================
--- CVE-2018-6952.patch	                        (rev 0)
+++ CVE-2018-6952.patch	2018-11-09 23:45:37 UTC (rev 338800)
@@ -0,0 +1,27 @@
+From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen at 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(-)
+
+diff --git a/src/pch.c b/src/pch.c
+index e92bc64..a500ad9 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -2122,7 +2122,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;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-09 23:45:10 UTC (rev 338799)
+++ PKGBUILD	2018-11-09 23:45:37 UTC (rev 338800)
@@ -16,30 +16,21 @@
 validpgpkeys=('259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher
 source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
         "https://github.com/mirror/patch/commit/f290f48a621867084884bfff87f8093c15195e6a.patch" # CVE-2018-6951
-        "http://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d" # CVE-2018-1000156
-        "https://github.com/mirror/patch/commit/9c986353e420ead6e706262bf204d6e03322c300.patch" # CVE-2018-6952
-        "http://git.savannah.gnu.org/cgit/patch.git/patch/?id=19599883ffb6a450d2884f081f8ecf68edbed7ee" # Fix memory leaks introduced in CVE-2018-1000165
-        "http://git.savannah.gnu.org/cgit/patch.git/patch/?id=369dcccdfa6336e5a873d6d63705cfbe04c55727"
-        )
+        # http://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d CVE-2018-1000156
+        "CVE-2018-1000156.patch"
+        # https://github.com/mirror/patch/commit/9c986353e420ead6e706262bf204d6e03322c300.patch CVE-2018-6952
+        "CVE-2018-6952.patch")
 md5sums=('78ad9937e4caadcba1526ef1853730d5'
          'SKIP'
          '7e34fc859ccc07b235a8b01b043ff456'
-         'd6e3c871b95c6a0c8b1b4f8b26e42c9c'
-         'aa8ac1e3dccbd523143b01e9f60b06e8'
-         'bba3e65611813a4467cdd73219a5059d'
-         '5eb2c88e30fa8775deaf0b29287bf6bd')
+         '45f911c911468c40328a07f74b9266ac'
+         'aa8ac1e3dccbd523143b01e9f60b06e8')
 
 prepare() {
   cd $pkgname-$pkgver
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      echo "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
-  done
-  :
+  patch -Np1 -i ${srcdir}/f290f48a621867084884bfff87f8093c15195e6a.patch
+  patch -Np1 -i ${srcdir}/CVE-2018-1000156.patch
+  patch -Np1 -i ${srcdir}/CVE-2018-6952.patch
 }
 
 build() {



More information about the arch-commits mailing list