From 14005a371e5c14289e96a4927ffd1a827d3c9d85 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 19 May 2018 22:10:11 +1000 Subject: [PATCH] ps: Increase command selection field to 64 The library now presents command names up to 64 characters, in line with the kernel changes. ps command name selection (the -C option) now also is 64 characters long. References: commit 2cfdbbe897f0d4e41460c7c2b92acfc5804652c8 --- NEWS | 1 + ps/common.h | 2 +- ps/select.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 70f2b455..1af539a4 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ procps-ng-3.3.15 * library: Fix integer overflow and LPE in file2strvec CVE-2018-1124 * library: Use size_t for alloc functions CVE-2018-1126 * library: Increase comm size to 64 + * ps: Increase command name selection field to 64 * top: Don't use cwd for location of config CVE-2018-1122 procps-ng-3.3.14 diff --git a/ps/common.h b/ps/common.h index fc4d3a8e..905d3205 100644 --- a/ps/common.h +++ b/ps/common.h @@ -189,7 +189,7 @@ typedef union sel_union { uid_t uid; gid_t gid; dev_t tty; - char cmd[16]; /* this is _not_ \0 terminated */ + char cmd[64]; /* this is _not_ \0 terminated */ } sel_union; typedef struct selection_node { diff --git a/ps/select.c b/ps/select.c index e12982d1..f58ca253 100644 --- a/ps/select.c +++ b/ps/select.c @@ -117,7 +117,7 @@ static int proc_was_listed(proc_t *buf){ break; case SEL_SESS: return_if_match(session,pid); break; case SEL_COMM: i=sn->n; while(i--) - if(!strncmp( buf->cmd, (*(sn->u+i)).cmd, 15 )) return 1; + if(!strncmp( buf->cmd, (*(sn->u+i)).cmd, 63 )) return 1; -- 2.40.0