From 1eaab5b736c0a47276fa77c363f524e4c2982c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20F=C3=BCl=C3=B6p?= Date: Tue, 9 Oct 2018 22:06:00 +0200 Subject: [PATCH 1/3] devel/patch: security fixes Fixes CVE-2018-6951, CVE-2018-6952 and CVE-2018-1000156. --- devel/patch/Makefile | 8 +- devel/patch/distinfo | 4 + devel/patch/patches/patch-config.hin | 20 +++ devel/patch/patches/patch-src_pch.c | 155 ++++++++++++++++++++ devel/patch/patches/patch-tests_Makefile.am | 14 ++ devel/patch/patches/patch-tests_ed-style | 48 ++++++ 6 files changed, 242 insertions(+), 7 deletions(-) create mode 100644 devel/patch/patches/patch-config.hin create mode 100644 devel/patch/patches/patch-src_pch.c create mode 100644 devel/patch/patches/patch-tests_Makefile.am create mode 100644 devel/patch/patches/patch-tests_ed-style diff --git a/devel/patch/Makefile b/devel/patch/Makefile index 50a419962ceb..fe9a2d0f4327 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -1,6 +1,7 @@ # $NetBSD: Makefile,v 1.44 2018/03/03 01:31:35 mef Exp $ DISTNAME= patch-2.7.6 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=patch/} EXTRACT_SUFX= .tar.xz @@ -20,13 +21,6 @@ CONFIGURE_ENV+= ac_cv_func_setmode_dos=no # Fix for Interix (and old bsd?) INSTALLATION_DIRS= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1 -do-patch: -.for stdhdr in sys/param.h sys/stat.h string.h - ${ECHO} "#ifdef HAVE_${stdhdr:tu:C,[/.],_,g}" >> ${WRKSRC}/config.hin - ${ECHO} "#include <${stdhdr}>" >> ${WRKSRC}/config.hin - ${ECHO} "#endif" >> ${WRKSRC}/config.hin -.endfor - SYMLINKS = bin/gpatch ${PKGGNUDIR}bin/patch \ man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1 post-install: diff --git a/devel/patch/distinfo b/devel/patch/distinfo index 06577f70ad33..64fac4474a06 100644 --- a/devel/patch/distinfo +++ b/devel/patch/distinfo @@ -4,3 +4,7 @@ SHA1 (patch-2.7.6.tar.xz) = 6f64fa75993bdb285ac4ed6eca6c9212725bff91 RMD160 (patch-2.7.6.tar.xz) = 439753620b4d27d606110093d0e586719b8451c3 SHA512 (patch-2.7.6.tar.xz) = fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd Size (patch-2.7.6.tar.xz) = 783756 bytes +SHA1 (patch-config.hin) = 051fc3971575c98830e4a9395425bd792930adc5 +SHA1 (patch-src_pch.c) = 0aed6cd0d64c380767c39908c388c91ddf3003d1 +SHA1 (patch-tests_Makefile.am) = b764e3afd0b421edb9099455fc146077ef707f83 +SHA1 (patch-tests_ed-style) = 7d7c2d04eddaab1d07c05022908a98ef9c984e08 diff --git a/devel/patch/patches/patch-config.hin b/devel/patch/patches/patch-config.hin new file mode 100644 index 000000000000..f17ce6160d0b --- /dev/null +++ b/devel/patch/patches/patch-config.hin @@ -0,0 +1,20 @@ +$NetBSD$ + + - Moved from Makefile. + +--- config.hin.orig 2018-10-09 04:28:07.759945480 +0000 ++++ config.hin +@@ -2053,3 +2053,13 @@ + + /* Define as a macro for copying va_list variables. */ + #undef va_copy ++ ++#ifdef HAVE_SYS_PARAM_H ++#include ++#endif ++#ifdef HAVE_SYS_STAT_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif diff --git a/devel/patch/patches/patch-src_pch.c b/devel/patch/patches/patch-src_pch.c new file mode 100644 index 000000000000..b8b9d57850dc --- /dev/null +++ b/devel/patch/patches/patch-src_pch.c @@ -0,0 +1,155 @@ +$NetBSD$ + + - fixes: CVE-2018-6951 CVE-2018-6952 CVE-2018-1000156 + + - bugs: 53132 53133 53566 + https://savannah.gnu.org/bugs/index.php? + + - commit ids: f290f48a62 9c986353e4 123eaff0d5 + https://git.savannah.gnu.org/cgit/patch.git/diff/?id= + +--- src/pch.c.orig 2018-10-09 17:01:21.566749708 +0000 ++++ src/pch.c +@@ -33,6 +33,7 @@ + # include + #endif + #include ++#include + + #define INITHUNKMAX 125 /* initial dynamic allocation size */ + +@@ -974,7 +975,8 @@ intuit_diff_type (bool need_header, mode + if ((pch_rename () || pch_copy ()) + && ! inname + && ! ((i == OLD || i == NEW) && +- p_name[! reverse] && ++ p_name[reverse] && p_name[! reverse] && ++ name_is_valid (p_name[reverse]) && + name_is_valid (p_name[! reverse]))) + { + say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); +@@ -2113,7 +2115,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; +@@ -2388,22 +2390,27 @@ do_ed_script (char const *inname, char c + 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) { +- 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)); +- } ++ 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)); ++ } + for (;;) { + char ed_command_letter; + beginning_of_this_line = file_tell (pfp); +@@ -2414,14 +2421,14 @@ do_ed_script (char const *inname, char c + } + 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; +@@ -2434,13 +2441,49 @@ do_ed_script (char const *inname, char c + 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 --git a/devel/patch/patches/patch-tests_Makefile.am b/devel/patch/patches/patch-tests_Makefile.am new file mode 100644 index 000000000000..bfbcda21381c --- /dev/null +++ b/devel/patch/patches/patch-tests_Makefile.am @@ -0,0 +1,14 @@ +$NetBSD$ + + - Add ed-style test, related to CVE-2018-1000156 fix. + +--- tests/Makefile.am.orig 2018-10-09 17:51:00.211605854 +0000 ++++ tests/Makefile.am +@@ -32,6 +32,7 @@ TESTS = \ + crlf-handling \ + dash-o-append \ + deep-directories \ ++ ed-style \ + empty-files \ + false-match \ + fifo \ diff --git a/devel/patch/patches/patch-tests_ed-style b/devel/patch/patches/patch-tests_ed-style new file mode 100644 index 000000000000..e4457f39ded2 --- /dev/null +++ b/devel/patch/patches/patch-tests_ed-style @@ -0,0 +1,48 @@ +$NetBSD$ + + - Add ed-style test, related to CVE-2018-1000156 fix. + +--- tests/ed-style.orig 2018-10-09 17:51:47.148455875 +0000 ++++ tests/ed-style +@@ -0,0 +1,41 @@ ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# ++# Copying and distribution of this file, with or without modification, ++# in any medium, are permitted without royalty provided the copyright ++# notice and this notice are preserved. ++ ++. $srcdir/test-lib.sh ++ ++require cat ++use_local_patch ++use_tmpdir ++ ++# ============================================================== ++ ++cat > ed1.diff < ed2.diff < /dev/null || echo "Status: $?"' < Date: Thu, 18 Oct 2018 13:52:50 +0200 Subject: [PATCH 2/3] devel/patch: remove config.hin patch, fixed upstream --- devel/patch/distinfo | 1 - devel/patch/patches/patch-config.hin | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 devel/patch/patches/patch-config.hin diff --git a/devel/patch/distinfo b/devel/patch/distinfo index 64fac4474a06..f2debde634e0 100644 --- a/devel/patch/distinfo +++ b/devel/patch/distinfo @@ -4,7 +4,6 @@ SHA1 (patch-2.7.6.tar.xz) = 6f64fa75993bdb285ac4ed6eca6c9212725bff91 RMD160 (patch-2.7.6.tar.xz) = 439753620b4d27d606110093d0e586719b8451c3 SHA512 (patch-2.7.6.tar.xz) = fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd Size (patch-2.7.6.tar.xz) = 783756 bytes -SHA1 (patch-config.hin) = 051fc3971575c98830e4a9395425bd792930adc5 SHA1 (patch-src_pch.c) = 0aed6cd0d64c380767c39908c388c91ddf3003d1 SHA1 (patch-tests_Makefile.am) = b764e3afd0b421edb9099455fc146077ef707f83 SHA1 (patch-tests_ed-style) = 7d7c2d04eddaab1d07c05022908a98ef9c984e08 diff --git a/devel/patch/patches/patch-config.hin b/devel/patch/patches/patch-config.hin deleted file mode 100644 index f17ce6160d0b..000000000000 --- a/devel/patch/patches/patch-config.hin +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD$ - - - Moved from Makefile. - ---- config.hin.orig 2018-10-09 04:28:07.759945480 +0000 -+++ config.hin -@@ -2053,3 +2053,13 @@ - - /* Define as a macro for copying va_list variables. */ - #undef va_copy -+ -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif From 585faf614151a5b38b9bc9eaa84525f46e03f325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20F=C3=BCl=C3=B6p?= Date: Thu, 18 Oct 2018 15:41:28 +0200 Subject: [PATCH 3/3] devel/patch: patch the right file --- devel/patch/distinfo | 2 +- devel/patch/patches/patch-tests_Makefile.am | 14 -------------- devel/patch/patches/patch-tests_Makefile.in | 12 ++++++++++++ 3 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 devel/patch/patches/patch-tests_Makefile.am create mode 100644 devel/patch/patches/patch-tests_Makefile.in diff --git a/devel/patch/distinfo b/devel/patch/distinfo index f2debde634e0..9a95217cc408 100644 --- a/devel/patch/distinfo +++ b/devel/patch/distinfo @@ -5,5 +5,5 @@ RMD160 (patch-2.7.6.tar.xz) = 439753620b4d27d606110093d0e586719b8451c3 SHA512 (patch-2.7.6.tar.xz) = fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd Size (patch-2.7.6.tar.xz) = 783756 bytes SHA1 (patch-src_pch.c) = 0aed6cd0d64c380767c39908c388c91ddf3003d1 -SHA1 (patch-tests_Makefile.am) = b764e3afd0b421edb9099455fc146077ef707f83 +SHA1 (patch-tests_Makefile.in) = 6ae000cd78d4946c8f76d5eb4322a9dd4e00ff55 SHA1 (patch-tests_ed-style) = 7d7c2d04eddaab1d07c05022908a98ef9c984e08 diff --git a/devel/patch/patches/patch-tests_Makefile.am b/devel/patch/patches/patch-tests_Makefile.am deleted file mode 100644 index bfbcda21381c..000000000000 --- a/devel/patch/patches/patch-tests_Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ - - - Add ed-style test, related to CVE-2018-1000156 fix. - ---- tests/Makefile.am.orig 2018-10-09 17:51:00.211605854 +0000 -+++ tests/Makefile.am -@@ -32,6 +32,7 @@ TESTS = \ - crlf-handling \ - dash-o-append \ - deep-directories \ -+ ed-style \ - empty-files \ - false-match \ - fifo \ diff --git a/devel/patch/patches/patch-tests_Makefile.in b/devel/patch/patches/patch-tests_Makefile.in new file mode 100644 index 000000000000..9d88af25aecd --- /dev/null +++ b/devel/patch/patches/patch-tests_Makefile.in @@ -0,0 +1,12 @@ +$NetBSD$ + +--- tests/Makefile.in.orig 2018-02-03 13:33:56.000000000 +0000 ++++ tests/Makefile.in +@@ -1308,6 +1308,7 @@ TESTS = \ + crlf-handling \ + dash-o-append \ + deep-directories \ ++ ed-style \ + empty-files \ + false-match \ + fifo \