From 6639b5025d4c120c30022cb2993832fcf0c2e928 Mon Sep 17 00:00:00 2001 From: Adrian Ratiu Date: Mon, 21 Jun 2021 12:21:40 +0300 Subject: sys-process/lsof: backport arm sigbus crash fix This backports an upstream fix for a crash which happens on armv7a + glibc 2.33 due to a buffer misalignment. Upstream issue: https://github.com/lsof-org/lsof/issues/160 Upstream commit: 21cb1dad1243f4c0a427d893babab12e48b60f0e Bug: https://bugs.gentoo.org/797358 Closes: https://github.com/gentoo/gentoo/pull/21354 Acked-by: David Seifert Signed-off-by: Adrian Ratiu Signed-off-by: Sam James --- .../lsof/files/lsof-4.94-arm-sigbus-fix.patch | 63 +++++++++++ sys-process/lsof/lsof-4.94.0-r1.ebuild | 117 +++++++++++++++++++++ sys-process/lsof/lsof-4.94.0.ebuild | 116 -------------------- 3 files changed, 180 insertions(+), 116 deletions(-) create mode 100644 sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch create mode 100644 sys-process/lsof/lsof-4.94.0-r1.ebuild delete mode 100644 sys-process/lsof/lsof-4.94.0.ebuild (limited to 'sys-process') diff --git a/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch new file mode 100644 index 000000000000..95bad206372e --- /dev/null +++ b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/797358 + +From 21cb1dad1243f4c0a427d893babab12e48b60f0e Mon Sep 17 00:00:00 2001 +From: Masatake YAMATO +Date: Sun, 20 Jun 2021 21:40:55 +0900 +Subject: [PATCH] Adjust alignment of buffer passed to stat() + +Close #160. + +The original code passes char[] buffer to stat(). +This can be cause a SIGBUS. + +#160 reported an actual crash on armv7a + glibc-2.33 platform. +See also https://sourceware.org/bugzilla/show_bug.cgi?id=27993. + +The issue is reported by @10ne1. + +Signed-off-by: Masatake YAMATO +[Adrian: Backported to 4.94] +Signed-off-by: Adrian Ratiu +--- a/misc.c ++++ b/misc.c +@@ -293,7 +293,15 @@ doinchild(fn, fp, rbuf, rbln) + */ + + int r_al, r_rbln; +- char r_arg[MAXPATHLEN+1], r_rbuf[MAXPATHLEN+1]; ++ char r_arg[MAXPATHLEN+1]; ++ union { ++ char r_rbuf[MAXPATHLEN+1]; ++ /* ++ * This field is only for adjusting the alignment of r_rbuf that ++ * can be used as an argument for stat(). ++ */ ++ struct stat _; ++ } r; + int (*r_fn)(); + /* + * Close sufficient open file descriptors except Pipes[0] and +@@ -358,16 +366,16 @@ doinchild(fn, fp, rbuf, rbln) + || read(Pipes[0], r_arg, r_al) != r_al + || read(Pipes[0], (char *)&r_rbln, sizeof(r_rbln)) + != (int)sizeof(r_rbln) +- || r_rbln < 1 || r_rbln > (int)sizeof(r_rbuf)) ++ || r_rbln < 1 || r_rbln > (int)sizeof(r.r_rbuf)) + break; +- zeromem (r_rbuf, r_rbln); +- rv = r_fn(r_arg, r_rbuf, r_rbln); ++ zeromem (r.r_rbuf, r_rbln); ++ rv = r_fn(r_arg, r.r_rbuf, r_rbln); + en = errno; + if (write(Pipes[3], (char *)&rv, sizeof(rv)) + != sizeof(rv) + || write(Pipes[3], (char *)&en, sizeof(en)) + != sizeof(en) +- || write(Pipes[3], r_rbuf, r_rbln) != r_rbln) ++ || write(Pipes[3], r.r_rbuf, r_rbln) != r_rbln) + break; + } + (void) _exit(0); +-- +2.32.0 + diff --git a/sys-process/lsof/lsof-4.94.0-r1.ebuild b/sys-process/lsof/lsof-4.94.0-r1.ebuild new file mode 100644 index 000000000000..f90987e76701 --- /dev/null +++ b/sys-process/lsof/lsof-4.94.0-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +MY_P="${P/-/_}" +DESCRIPTION="Lists open files for running Unix processes" +HOMEPAGE="https://github.com/lsof-org/lsof" +SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="lsof" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="examples ipv6 rpc selinux" + +RDEPEND="rpc? ( net-libs/libtirpc ) + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/groff + rpc? ( virtual/pkgconfig ) +" + +# needs fixing first +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-4.85-cross.patch #432120 + "${FILESDIR}"/${PN}-4.94-arm-sigbus-fix.patch +) + +src_prepare() { + default + # fix POSIX compliance with `echo` + sed -i \ + -e 's:echo -n:printf:' \ + AFSConfig Configure Customize Inventory tests/CkTestDB || die + # Convert `test -r header.h` into a compile test. + # Make sure we convert `test ... -a ...` into two `test` commands + # so we can then convert both over into a compile test. #601432 + sed -i -E \ + -e '/if test .* -a /s: -a : \&\& test :g' \ + -e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \ + -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \ + Configure || die + + # "create" man-page (bug #689462) + # inspired by shipped "makeman" ksh script + soelim < Lsof.8 > lsof.8 || die +} + +target() { + case ${CHOST} in + *-darwin*) echo darwin ;; + *-freebsd*) echo freebsd ;; + *-solaris*) echo solaris ;; + *-aix*) echo aixgcc ;; + *) echo linux ;; + esac +} + +src_configure() { + append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H") + append-cppflags $(usex ipv6 -{D,U}HASIPv6) + [[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX + if [[ ${CHOST} == *-darwin* ]] ; then + # make sys/proc_info.h available in ${T} because of LSOF_INCLUDE + # dummy location -- Darwin needs this for a Configure check to + # succeed + if [[ -e /usr/include/sys/proc_info.h ]] ; then + mkdir -p "${T}"/sys || die + ( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die + fi + fi + + export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \ + $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)" + + # Set LSOF_INCLUDE to a dummy location so the script doesn't poke + # around in it and mix /usr/include paths with cross-compile/etc. + touch .neverInv + LINUX_HASSELINUX=$(usex selinux y n) \ + LSOF_INCLUDE=${T} \ + LSOF_CC=$(tc-getCC) \ + LSOF_AR="$(tc-getAR) rc" \ + LSOF_RANLIB=$(tc-getRANLIB) \ + LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \ + ./Configure -n $(target) || die +} + +src_compile() { + emake DEBUG="" all +} + +src_install() { + dobin lsof + + if use examples ; then + insinto /usr/share/lsof/scripts + doins scripts/* + fi + + doman lsof.8 + dodoc 00* +} + +pkg_postinst() { + if [[ ${CHOST} == *-solaris* ]] ; then + einfo "Note: to use lsof on Solaris you need read permissions on" + einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys" + elif [[ ${CHOST} == *-aix* ]] ; then + einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and" + einfo "/dev/kmem, i.e. you need to be root, or to be in the group system" + fi +} diff --git a/sys-process/lsof/lsof-4.94.0.ebuild b/sys-process/lsof/lsof-4.94.0.ebuild deleted file mode 100644 index e71171a60c4d..000000000000 --- a/sys-process/lsof/lsof-4.94.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -MY_P="${P/-/_}" -DESCRIPTION="Lists open files for running Unix processes" -HOMEPAGE="https://github.com/lsof-org/lsof" -SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="lsof" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="examples ipv6 rpc selinux" - -RDEPEND="rpc? ( net-libs/libtirpc ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-apps/groff - rpc? ( virtual/pkgconfig ) -" - -# needs fixing first -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-4.85-cross.patch #432120 -) - -src_prepare() { - default - # fix POSIX compliance with `echo` - sed -i \ - -e 's:echo -n:printf:' \ - AFSConfig Configure Customize Inventory tests/CkTestDB || die - # Convert `test -r header.h` into a compile test. - # Make sure we convert `test ... -a ...` into two `test` commands - # so we can then convert both over into a compile test. #601432 - sed -i -E \ - -e '/if test .* -a /s: -a : \&\& test :g' \ - -e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \ - -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \ - Configure || die - - # "create" man-page (bug #689462) - # inspired by shipped "makeman" ksh script - soelim < Lsof.8 > lsof.8 || die -} - -target() { - case ${CHOST} in - *-darwin*) echo darwin ;; - *-freebsd*) echo freebsd ;; - *-solaris*) echo solaris ;; - *-aix*) echo aixgcc ;; - *) echo linux ;; - esac -} - -src_configure() { - append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H") - append-cppflags $(usex ipv6 -{D,U}HASIPv6) - [[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX - if [[ ${CHOST} == *-darwin* ]] ; then - # make sys/proc_info.h available in ${T} because of LSOF_INCLUDE - # dummy location -- Darwin needs this for a Configure check to - # succeed - if [[ -e /usr/include/sys/proc_info.h ]] ; then - mkdir -p "${T}"/sys || die - ( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die - fi - fi - - export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \ - $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)" - - # Set LSOF_INCLUDE to a dummy location so the script doesn't poke - # around in it and mix /usr/include paths with cross-compile/etc. - touch .neverInv - LINUX_HASSELINUX=$(usex selinux y n) \ - LSOF_INCLUDE=${T} \ - LSOF_CC=$(tc-getCC) \ - LSOF_AR="$(tc-getAR) rc" \ - LSOF_RANLIB=$(tc-getRANLIB) \ - LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \ - ./Configure -n $(target) || die -} - -src_compile() { - emake DEBUG="" all -} - -src_install() { - dobin lsof - - if use examples ; then - insinto /usr/share/lsof/scripts - doins scripts/* - fi - - doman lsof.8 - dodoc 00* -} - -pkg_postinst() { - if [[ ${CHOST} == *-solaris* ]] ; then - einfo "Note: to use lsof on Solaris you need read permissions on" - einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys" - elif [[ ${CHOST} == *-aix* ]] ; then - einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and" - einfo "/dev/kmem, i.e. you need to be root, or to be in the group system" - fi -} -- cgit v1.2.3-65-gdbad