Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2018-03-29 11:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemtap" Thu Mar 29 11:50:06 2018 rev:100 rq:591170 version:3.2 Changes: -------- systemtap-headers.changes: same change --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2018-02-25 12:19:46.693164457 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2018-03-29 11:50:08.574204482 +0200 @@ -1,0 +2,6 @@ +Fri Mar 23 23:54:17 UTC 2018 - [email protected] + +- GCC 8 fixes (bsc#1084642) + New patch: systemtap-fixes-for-gcc-8.patch + +------------------------------------------------------------------- New: ---- systemtap-fixes-for-gcc-8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-docs.spec ++++++ --- /var/tmp/diff_new_pack.xBalOx/_old 2018-03-29 11:50:09.554169185 +0200 +++ /var/tmp/diff_new_pack.xBalOx/_new 2018-03-29 11:50:09.554169185 +0200 @@ -20,7 +20,7 @@ Version: 3.2 Release: 0 Summary: Documents and examples for systemtap -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz ++++++ systemtap-headers.spec ++++++ --- /var/tmp/diff_new_pack.xBalOx/_old 2018-03-29 11:50:09.578168321 +0200 +++ /var/tmp/diff_new_pack.xBalOx/_new 2018-03-29 11:50:09.578168321 +0200 @@ -28,7 +28,7 @@ Version: 3.2 Release: 0 Summary: SystemTap headers -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ # sdt-devel provides the same header files as us, so we ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.xBalOx/_old 2018-03-29 11:50:09.618166880 +0200 +++ /var/tmp/diff_new_pack.xBalOx/_new 2018-03-29 11:50:09.626166592 +0200 @@ -23,7 +23,7 @@ Version: 3.2 Release: 0 Summary: Instrumentation System -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz @@ -34,6 +34,7 @@ Source5: stap-server.conf Patch1: systemtap-build-source-dir.patch Patch2: systemtap-change-extra_cflags-escape-processing.patch +Patch3: systemtap-fixes-for-gcc-8.patch BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: libcap-devel @@ -83,9 +84,9 @@ %package sdt-devel Summary: Static probe support tools -Group: Development/Tools/Debuggers # systemtap-headers provides the same header files # as sdt-devel, so we must conflict. +Group: Development/Tools/Debuggers Conflicts: systemtap-headers Requires: %{name} = %{version}-%{release} @@ -97,6 +98,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure \ ++++++ systemtap-fixes-for-gcc-8.patch ++++++ From: Stan Cox <[email protected]> Date: Tue Feb 13 22:38:03 2018 -0500S Subject: Fixes for gcc 8 Git-commit: a8e317b60139238fef4038027eb37507e066d720 References: bsc#1084642 Signed-off-by: Tony Jones <[email protected]> Fixes for gcc 8 * includes/sys/sdt.h (__SDT_COND_SIGNED): Add CT, cast type argument Author: Will Cohen <wcohen.redhat.com> * stap-serverd.cxx (generate_mok, handleRequest, handle_connection): Catch format overflow * translate.cxx (translate_pass): Use ref in catch. diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index 940f74483..c0c5a492c 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -119,8 +119,8 @@ struct __sdt_type #define __SDT_ALWAYS_SIGNED(T) \ template<> struct __sdt_type<T> { static const bool __sdt_signed = true; }; -#define __SDT_COND_SIGNED(T) \ -template<> struct __sdt_type<T> { static const bool __sdt_signed = ((T)(-1) < 1); }; +#define __SDT_COND_SIGNED(T,CT) \ +template<> struct __sdt_type<T> { static const bool __sdt_signed = ((CT)(-1) < 1); }; __SDT_ALWAYS_SIGNED(signed char) __SDT_ALWAYS_SIGNED(short) __SDT_ALWAYS_SIGNED(int) @@ -141,14 +141,14 @@ __SDT_ALWAYS_SIGNED(const volatile short) __SDT_ALWAYS_SIGNED(const volatile int) __SDT_ALWAYS_SIGNED(const volatile long) __SDT_ALWAYS_SIGNED(const volatile long long) -__SDT_COND_SIGNED(char) -__SDT_COND_SIGNED(wchar_t) -__SDT_COND_SIGNED(volatile char) -__SDT_COND_SIGNED(volatile wchar_t) -__SDT_COND_SIGNED(const char) -__SDT_COND_SIGNED(const wchar_t) -__SDT_COND_SIGNED(const volatile char) -__SDT_COND_SIGNED(const volatile wchar_t) +__SDT_COND_SIGNED(char, char) +__SDT_COND_SIGNED(wchar_t, wchar_t) +__SDT_COND_SIGNED(volatile char, char) +__SDT_COND_SIGNED(volatile wchar_t, wchar_t) +__SDT_COND_SIGNED(const char, char) +__SDT_COND_SIGNED(const wchar_t, wchar_t) +__SDT_COND_SIGNED(const volatile char, char) +__SDT_COND_SIGNED(const volatile wchar_t, wchar_t) #if defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) /* __SDT_COND_SIGNED(char16_t) */ /* __SDT_COND_SIGNED(char32_t) */ diff --git a/stap-serverd.cxx b/stap-serverd.cxx index b8f70114c..063c3c587 100644 --- a/stap-serverd.cxx +++ b/stap-serverd.cxx @@ -1607,6 +1607,7 @@ generate_mok(string &mok_fingerprint) char tmpdir[PATH_MAX] = { '\0' }; string public_cert_path, private_cert_path, destdir; mode_t old_umask; + int retlen; mok_fingerprint.clear (); @@ -1631,7 +1632,14 @@ generate_mok(string &mok_fingerprint) } // Make a temporary directory to store results in. - snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); + retlen = snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Could not create %s name", "temporary directory")); + tmpdir[0] = '\0'; + goto cleanup; + } + if (mkdtemp (tmpdir) == NULL) { server_error (_F("Could not create temporary directory %s: %s", tmpdir, @@ -1704,6 +1712,7 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri unsigned u; unsigned i; FILE* f; + int retlen; // Save the server version. Do this early, so the client knows what version of the server // it is dealing with, even if the request is not fully completed. @@ -1782,7 +1791,12 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri struct stat st; char *arg; - snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); + retlen = snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "path")); + return; + } rc = stat(stapargfile, & st); if (rc) break; @@ -1888,7 +1902,15 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri { glob_t globber; char pattern[PATH_MAX]; - snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); + int retlen; + + retlen = snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "pattern")); + return; + } + rc = glob (pattern, GLOB_ERR, NULL, &globber); if (rc) server_error (_F("Unable to find a module in %s", new_staptmpdir.c_str())); @@ -2164,6 +2186,7 @@ handle_connection (void *arg) copy for each connection.*/ vector<string> argv; PRInt32 bytesRead; + int retlen; /* Detatch to avoid a memory leak */ if(max_threads > 0) @@ -2213,7 +2236,13 @@ handle_connection (void *arg) #endif secStatus = SECFailure; - snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); + retlen = snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "temporary directory")); + tmpdir[0]=0; /* prevent /bin/rm */ + goto cleanup; + } rc1 = mkdtemp(tmpdir); if (! rc1) { @@ -2223,9 +2252,20 @@ handle_connection (void *arg) } /* Create a temporary files names and directories. */ - snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); + retlen = snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "request.zip path")); + goto cleanup; + } + + retlen = snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "request directory path")); + goto cleanup; + } - snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); rc = mkdir(requestDirName, 0700); if (rc) { @@ -2233,7 +2273,13 @@ handle_connection (void *arg) goto cleanup; } - snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); + retlen = snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "response directory path")); + goto cleanup; + } + rc = mkdir(responseDirName, 0700); if (rc) { @@ -2243,7 +2289,12 @@ handle_connection (void *arg) // Set this early, since it gets used for errors to be returned to the client. stapstderr = string(responseDirName) + "/stderr"; - snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); + retlen = snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); + if (retlen < 0 || retlen >= PATH_MAX) + { + server_error (_F("Error creating %s name", "response.zip path")); + goto cleanup; + } /* Read data from the socket. * If the user is requesting/requiring authentication, authenticate diff --git a/translate.cxx b/translate.cxx index 1240a80ec..4ade06fdd 100644 --- a/translate.cxx +++ b/translate.cxx @@ -7860,7 +7860,7 @@ translate_pass (systemtap_session& s) if (versions.size() >= 3 && s.verbose > 1) clog << _F("ignoring extra parts of compat version: %s", s.compatible.c_str()) << endl; } - catch (const runtime_error) + catch (const runtime_error&) { throw SEMANTIC_ERROR(_F("parse error in compatibility version: %s", s.compatible.c_str())); }
