diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0002-Test-suite-compatibility-fixes.patch | 277 |
1 files changed, 199 insertions, 78 deletions
diff --git a/patches/0002-Test-suite-compatibility-fixes.patch b/patches/0002-Test-suite-compatibility-fixes.patch index 07de67c..7173848 100644 --- a/patches/0002-Test-suite-compatibility-fixes.patch +++ b/patches/0002-Test-suite-compatibility-fixes.patch @@ -1,90 +1,211 @@ -From f6bc5b14bd193859851d15a049bafb1007acd288 Mon Sep 17 00:00:00 2001 +From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher <agruen@gnu.org> -Date: Wed, 7 Feb 2018 12:10:41 +0100 -Subject: [PATCH 02/17] Test suite compatibility fixes +Date: Fri, 6 Apr 2018 12:14:49 +0200 +Subject: [PATCH 06/17] Fix arbitrary command execution in ed-style patches + (CVE-2018-1000156) -* tests/crlf-handling, tests/git-cleanup, tests/test-lib.sh: Use printf -instead of echo -e / echo -n for compatibility with systems that don't -support these echo options. -* tests/merge: Minor other cleanups. +* src/pch.c (do_ed_script): Write ed script to a temporary file instead +of piping it to ed: this will cause ed to abort on invalid commands +instead of rejecting them and carrying on. +* tests/ed-style: New test case. +* tests/Makefile.am (TESTS): Add test case. --- - tests/crlf-handling | 2 +- - tests/git-cleanup | 4 ++-- - tests/merge | 18 ++++++++---------- - tests/test-lib.sh | 21 +++++++-------------- - 4 files changed, 18 insertions(+), 27 deletions(-) + src/pch.c | 91 ++++++++++++++++++++++++++++++++++++++++--------------- + tests/Makefile.am | 1 + + tests/ed-style | 41 +++++++++++++++++++++++++ + 3 files changed, 108 insertions(+), 25 deletions(-) + create mode 100644 tests/ed-style -diff --git a/tests/crlf-handling b/tests/crlf-handling -index 239149c..c192cac 100644 ---- a/tests/crlf-handling -+++ b/tests/crlf-handling -@@ -14,7 +14,7 @@ use_local_patch - use_tmpdir +diff --git a/src/pch.c b/src/pch.c +index 0c5cc26..4fd5a05 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -33,6 +33,7 @@ + # include <io.h> + #endif + #include <safe.h> ++#include <sys/wait.h> - lf2crlf() { -- while read l; do echo -e "$l\r"; done -+ while read l; do printf "%s\r\n" "$l"; done - } + #define INITHUNKMAX 125 /* initial dynamic allocation size */ - echo 1 > a -diff --git a/tests/git-cleanup b/tests/git-cleanup -index 2e3e4c6..ca527a1 100644 ---- a/tests/git-cleanup -+++ b/tests/git-cleanup -@@ -36,8 +36,8 @@ BAD PATCH - EOF +@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname, + static char const editor_program[] = EDITOR_PROGRAM; - echo 1 > f --echo -n '' > g --echo -n '' > h -+printf '' > g -+printf '' > h + 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)); ++ } - check 'patch -f -i 1.diff || echo status: $?' <<EOF - patching file f -diff --git a/tests/merge b/tests/merge -index 22d787b..b628891 100644 ---- a/tests/merge -+++ b/tests/merge -@@ -30,30 +30,28 @@ x2() { - while test $# -gt 0 && test "$1" != -- ; do - echo "$1" - shift -- done > a.sed -- echo "$body" | sed -f a.sed > b -+ done > b.sed -+ echo "$body" | sed -f b.sed > b - shift - while test $# -gt 0 ; do - echo "$1" - shift -- done > b.sed -- echo "$body" | sed -f b.sed > c -- rm -f a.sed b.sed -+ done > c.sed -+ echo "$body" | sed -f c.sed > c -+ rm -f b.sed c.sed - output=`diff -u a b | patch $ARGS -f c` - status=$? - echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d' - cat c -- test $status == 0 || echo "Status: $status" -+ test $status = 0 || echo "Status: $status" - } +- if (! dry_run && ! skip_rest_of_patch) { +- int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- 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); +- 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); +@@ -2417,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname, + } + 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; +@@ -2437,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname, + 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); - x() { -- ARGS="$ARGS --merge" x2 "$@" -+ ARGS="--merge" x2 "$@" - echo -- ARGS="$ARGS --merge=diff3" x2 "$@" -+ ARGS="--merge=diff3" x2 "$@" - } - --unset ARGS -- - # ============================================================== - - check 'x 3' <<EOF + if (ofp) + { +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 6b6df63..16f8693 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -32,6 +32,7 @@ TESTS = \ + crlf-handling \ + dash-o-append \ + deep-directories \ ++ ed-style \ + empty-files \ + false-match \ + fifo \ +diff --git a/tests/ed-style b/tests/ed-style +new file mode 100644 +index 0000000..d8c0689 +--- /dev/null ++++ b/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 <<EOF ++0a ++foo ++. ++EOF ++ ++check 'patch -e foo -i ed1.diff' <<EOF ++EOF ++ ++check 'cat foo' <<EOF ++foo ++EOF ++ ++cat > ed2.diff <<EOF ++1337a ++r !echo bar ++,p ++EOF ++ ++check 'patch -e foo -i ed2.diff 2> /dev/null || echo "Status: $?"' <<EOF ++? ++Status: 2 ++EOF ++ ++check 'cat foo' <<EOF ++foo ++EOF -- 2.11.0 |