[arch-commits] Commit in procps-ng/trunk (PKGBUILD fs66093.patch)

[Bartłomiej Piotrowski]

    Date: Friday, May 22, 2020 @ 12:42:11
  Author: bpiotrowski
Revision: 387421

3.3.16-2: Backport "pgrep: check sanity of SC_ARG_MAX"

Added:
  procps-ng/trunk/fs66093.patch
Modified:
  procps-ng/trunk/PKGBUILD

---------------+
 PKGBUILD      |   12 ++++++++---
 fs66093.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-22 12:38:17 UTC (rev 387420)
+++ PKGBUILD	2020-05-22 12:42:11 UTC (rev 387421)
@@ -4,7 +4,7 @@
 
 pkgname=procps-ng
 pkgver=3.3.16
-pkgrel=1
+pkgrel=2
 pkgdesc='Utilities for monitoring your system and its processes'
 url='https://gitlab.com/procps-ng/procps'
 license=(GPL LGPL)
@@ -15,12 +15,18 @@
 provides=(procps sysvinit-tools)
 replaces=(procps sysvinit-tools)
 install=install
-source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af')
+source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz
+        fs66093.patch)
+sha256sums=('925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af'
+            '48eb1f6e1b84d9dfec27556771c05f6a02880aefbe774a3db71bee0c35228992')
 
 prepare() {
   cd $pkgname-$pkgver
   sed 's:<ncursesw/:<:g' -i watch.c
+
+  # pgrep: check sanity of SC_ARG_MAX 
+  # https://bugs.archlinux.org/task/66093
+  patch -p1 -i ../fs66093.patch
 }
 
 build() {

Added: fs66093.patch
===================================================================
--- fs66093.patch	                        (rev 0)
+++ fs66093.patch	2020-05-22 12:42:11 UTC (rev 387421)
@@ -0,0 +1,60 @@
+From bb96fc42956c9ed926a1b958ab715f8b4a663dec Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall at dropbear.xyz>
+Date: Sun, 5 Jan 2020 15:05:55 +1100
+Subject: [PATCH] pgrep: check sanity of SC_ARG_MAX
+
+A kernel change means we cannot trust what sysconf(SC_ARG_MAX)
+returns. We clamp it so its more than 4096 and less than 128*1024
+which is what findutils does.
+
+References:
+ procps-ng/procps#152
+ https://git.savannah.gnu.org/cgit/findutils.git/tree/lib/buildcmd.c#n535
+ https://lwn.net/Articles/727862/
+---
+ pgrep.c | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/pgrep.c b/pgrep.c
+index 01563db..bde7448 100644
+--- a/pgrep.c
++++ b/pgrep.c
+@@ -485,6 +485,26 @@ static regex_t * do_regcomp (void)
+ 	return preg;
+ }
+ 
++/*
++ * SC_ARG_MAX used to return the maximum size a command line can be
++ * however changes to the kernel mean this can be bigger than we can
++ * alloc. Clamp it to 128kB like xargs and friends do
++ * Should also not be smaller than POSIX_ARG_MAX which is 4096
++ */
++static size_t get_arg_max(void)
++{
++#define MIN_ARG_SIZE 4096u
++#define MAX_ARG_SIZE (128u * 1024u)
++
++    size_t val = sysconf(_SC_ARG_MAX);
++
++    if (val < MIN_ARG_SIZE)
++	val = MIN_ARG_SIZE;
++    if (val > MAX_ARG_SIZE)
++	val = MAX_ARG_SIZE;
++
++    return val;
++}
+ static struct el * select_procs (int *num)
+ {
+ 	PROCTAB *ptp;
+@@ -497,7 +517,7 @@ static struct el * select_procs (int *num)
+ 	regex_t *preg;
+ 	pid_t myself = getpid();
+ 	struct el *list = NULL;
+-        long cmdlen = sysconf(_SC_ARG_MAX) * sizeof(char);
++        long cmdlen = get_arg_max() * sizeof(char);
+ 	char *cmdline = xmalloc(cmdlen);
+ 	char *cmdsearch = xmalloc(cmdlen);
+ 	char *cmdoutput = xmalloc(cmdlen);
+-- 
+2.26.2
+