From ba153cf4c6b9f6375a86058735337776cc361669 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 17 Sep 2019 21:01:20 +0000 Subject: Tue Sep 17 21:01:20 UTC 2019 a/eudev-3.2.8-x86_64-2.txz: Rebuilt. Blacklisted mlx_wdt in watchdog.conf. Thanks to Robby Workman. l/libical-3.0.6-x86_64-1.txz: Upgraded. n/rpcbind-1.2.5-x86_64-2.txz: Rebuilt. Added patch from git master to fix a segfault. Fixed application of the next patch. Thanks to Robby Workman. x/freeglut-3.2.0-x86_64-1.txz: Upgraded. x/mesa-19.1.7-x86_64-1.txz: Upgraded. --- source/a/eudev/config/modprobe.d/watchdog.conf | 1 + source/a/eudev/eudev.SlackBuild | 2 +- .../0001-rpcinfo-Fix-stack-buffer-overflow.patch | 69 ++++++++++++++++++++++ source/n/rpcbind/rpcbind.SlackBuild | 7 ++- source/x/freeglut/freeglut.SlackBuild | 8 +-- 5 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 source/n/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch (limited to 'source') diff --git a/source/a/eudev/config/modprobe.d/watchdog.conf b/source/a/eudev/config/modprobe.d/watchdog.conf index 2a39a0e93..ad112cb6c 100644 --- a/source/a/eudev/config/modprobe.d/watchdog.conf +++ b/source/a/eudev/config/modprobe.d/watchdog.conf @@ -33,6 +33,7 @@ blacklist mei_wdt blacklist mena21_wdt blacklist menf21bmc_wdt blacklist mixcomwd +blacklist mlx_wdt blacklist ni903x_wdt blacklist nic7018_wdt blacklist nv_tco diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild index 90e1a0696..1e8f766fe 100755 --- a/source/a/eudev/eudev.SlackBuild +++ b/source/a/eudev/eudev.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=eudev VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch b/source/n/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch new file mode 100644 index 000000000..14fd88c8d --- /dev/null +++ b/source/n/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch @@ -0,0 +1,69 @@ +From 0bc1c0ae7ce61a7ac8a8e9a9b2086268f011abf0 Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Tue, 9 Oct 2018 09:19:50 -0400 +Subject: [PATCH] rpcinfo: Fix stack buffer overflow + +*** buffer overflow detected ***: rpcinfo terminated +======= Backtrace: ========= +/lib64/libc.so.6(+0x721af)[0x7ff24c4451af] +/lib64/libc.so.6(__fortify_fail+0x37)[0x7ff24c4ccdc7] +/lib64/libc.so.6(+0xf8050)[0x7ff24c4cb050] +rpcinfo(+0x435f)[0xef3be2635f] +rpcinfo(+0x1c62)[0xef3be23c62] +/lib64/libc.so.6(__libc_start_main+0xf5)[0x7ff24c3f36e5] +rpcinfo(+0x2739)[0xef3be24739] +======= Memory map: ======== +... +The patch below fixes it. + +Reviewed-by: Chuck Lever +Signed-off-by: Thomas Blume +Signed-off-by: Steve Dickson +--- + src/rpcinfo.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +diff --git a/src/rpcinfo.c b/src/rpcinfo.c +index 9b46864..cfdba88 100644 +--- a/src/rpcinfo.c ++++ b/src/rpcinfo.c +@@ -973,6 +973,7 @@ rpcbdump (dumptype, netid, argc, argv) + (" program version(s) netid(s) service owner\n"); + for (rs = rs_head; rs; rs = rs->next) + { ++ size_t netidmax = sizeof(buf) - 1; + char *p = buf; + + printf ("%10ld ", rs->prog); +@@ -985,12 +986,22 @@ rpcbdump (dumptype, netid, argc, argv) + } + printf ("%-10s", buf); + buf[0] = '\0'; +- for (nl = rs->nlist; nl; nl = nl->next) +- { +- strcat (buf, nl->netid); +- if (nl->next) +- strcat (buf, ","); +- } ++ ++ for (nl = rs->nlist; nl; nl = nl->next) ++ { ++ strncat (buf, nl->netid, netidmax); ++ if (strlen (nl->netid) < netidmax) ++ netidmax -= strlen(nl->netid); ++ else ++ break; ++ ++ if (nl->next && netidmax > 1) ++ { ++ strncat (buf, ",", netidmax); ++ netidmax --; ++ } ++ } ++ + printf ("%-32s", buf); + rpc = getrpcbynumber (rs->prog); + if (rpc) +-- +2.22.0 + diff --git a/source/n/rpcbind/rpcbind.SlackBuild b/source/n/rpcbind/rpcbind.SlackBuild index 274802239..beafc6e88 100755 --- a/source/n/rpcbind/rpcbind.SlackBuild +++ b/source/n/rpcbind/rpcbind.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rpcbind VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -84,8 +84,11 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +# git patches: +zcat $CWD/0001-rpcinfo-Fix-stack-buffer-overflow.patch.gz | patch -p1 --verbose || exit 1 + # Local patches: -zcat $CWD/0001-man-rpcibind.8-Clarify-state-file-usage-and-history.patch | patch -p1 --verbose || exit 1 +zcat $CWD/0001-man-rpcibind.8-Clarify-state-file-usage-and-history.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/rpcbind.lwrap.needs.lnsl.diff.gz | patch -p1 --verbose || exit 1 # This is needed after the libwrap patch above: diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild index 935a71cec..f1e10c978 100755 --- a/source/x/freeglut/freeglut.SlackBuild +++ b/source/x/freeglut/freeglut.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for freeglut # Copyright 2012 Robby Workman, Northport, Alabama, USA -# Copyright 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freeglut -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -72,7 +72,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION chown -R root:root . find . \ -- cgit v1.2.3