From c32ab58b942d6dc2d6b4d45114af2ba9572aaa50 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 19 May 2018 08:14:06 +1000 Subject: [PATCH] pgrep: Remove >15 warning As comm length can be longer than 15 characters with newer kernels, it doesn't make sense to have a warning when you make the match string longer than this. As a side-effect, it removes the false-positive you got when you used long regex matches (see issue #92 ) References: commit 2cfdbbe897f0d4e41460c7c2b92acfc5804652c8 procps-ng/procps#92 --- NEWS | 1 + pgrep.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 0483f270..70f2b455 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ procps-ng-3.3.15 No removals, no new functions Changes: slab and pid structures * pgrep: Fix stack-based buffer overflow CVE-2018-1125 + * pgrep: Remove >15 warning as comm can be longer issue #92 * ps: Fix buffer overflow in output buffer, causing DOS CVE-2018-1123 * library: Just check for SIGLOST and don't delete it issue #93 * library: Fix integer overflow and LPE in file2strvec CVE-2018-1124 diff --git a/pgrep.c b/pgrep.c index 65a7a7d2..715e5cfb 100644 --- a/pgrep.c +++ b/pgrep.c @@ -653,10 +653,6 @@ static struct el * select_procs (int *num) closeproc (ptp); *num = matches; - if ((!matches) && (!opt_full) && opt_pattern && (strlen(opt_pattern) > 15)) - xwarnx(_("pattern that searches for process name longer than 15 characters will result in zero matches\n" - "Try `%s -f' option to match against the complete command line."), - program_invocation_short_name); return list; }