lsns: Fix parser for /proc/<pid>/stat which is including space in comm
PATCH 1/1 lsns: Fix parser for /proc/<pid>/stat which is including space in comm
Signed-off-by OGAWA Hirofumi <[email protected]>
---
sys-utils/lsns.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
sys-utils/lsns.c renamed from sys-utils/lsns.c~fix-stat-parse +26 -4
@@ -217,6 +217,30 @@ static int get_ns_ino(int dir, const chareturn 0 ; } +static int parse_proc_stat (FILE *fp,pid_t *pid,char *state,pid_t *ppid) +{ +char *line =NULL , *p; +size_t len =0 ; +int rc; + +if (getline (&line, &len, fp) <0 ) { + rc = -errno; + goto error; + } + + p =strrchr (line,')' ); +if (p ==NULL || +sscanf (line,"%d (" , pid) !=1 || +sscanf (p,") %c %d*[^\n]" , state, ppid) !=2 ) { + rc = -EINVAL ; + goto error; + } + rc =0 ; + +error: +free (line); +return rc; +}static int read_process (struct lsns *ls,pid_t pid) {
@@ -255,11 +279,9 @@ static int read_process(struct lsns *ls, rc = -errno; goto done; } - rc =fscanf (f,"%d %*s %c %d*[^\n]" , &p->pid, &p->state, &p->ppid); -if (rc !=3 ) { - rc = rc <0 ? -errno : -EINVAL ; + rc =parse_proc_stat (f, &p->pid, &p->state, &p->ppid); +if (rc <0 ) goto done; - } rc =0 ;for (i =0 ; i <ARRAY_SIZE (p->ns_ids); i++) {
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
Quoted 2 lines · OGAWA Hirofumi
Signed-off-by OGAWA Hirofumi <[email protected]>
can you please include an example line in the commit message ? -mike
Quoted 5 lines · Mike Frysinger
Quoted 2 lines · OGAWA Hirofumi
Signed-off-by OGAWA Hirofumi <[email protected]>can you please include an example line in the commit message ?
ok.
Signature · 1 line
OGAWA Hirofumi <[email protected]>
PATCH v2 1/1 lsns: Fix parser for /proc/<pid>/stat which is including space in comm
In reply to Mike FrysingerFor example, child process of spamd has
32031 (spamd child) S 32026 32026 32026 0 -1 4210752 338 0 0 0 ...
fscanf("%d %*s %c %d*[^\n]") in read_process() can't parse above as we expected, because %s only skips non-whitespace. I.e. it parses like following,
32031 (spamd child) S 32026 32026 32026 0 -1 4210752 338 0 0 0 ...
+---+ +----+ +
%d %*s %cand returns 2 (pid=32031, state=c).
This fixes it by skipping task->comm part manually.
Signed-off-by OGAWA Hirofumi <[email protected]>
---
sys-utils/lsns.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
sys-utils/lsns.c renamed from sys-utils/lsns.c~a +26 -4
@@ -217,6 +217,30 @@ static int get_ns_ino(int dir, const chareturn 0 ; } +static int parse_proc_stat (FILE *fp,pid_t *pid,char *state,pid_t *ppid) +{ +char *line =NULL , *p; +size_t len =0 ; +int rc; + +if (getline (&line, &len, fp) <0 ) { + rc = -errno; + goto error; + } + + p =strrchr (line,')' ); +if (p ==NULL || +sscanf (line,"%d (" , pid) !=1 || +sscanf (p,") %c %d*[^\n]" , state, ppid) !=2 ) { + rc = -EINVAL ; + goto error; + } + rc =0 ; + +error: +free (line); +return rc; +}static int read_process (struct lsns *ls,pid_t pid) {
@@ -255,11 +279,9 @@ static int read_process(struct lsns *ls, rc = -errno; goto done; } - rc =fscanf (f,"%d %*s %c %d*[^\n]" , &p->pid, &p->state, &p->ppid); -if (rc !=3 ) { - rc = rc <0 ? -errno : -EINVAL ; + rc =parse_proc_stat (f, &p->pid, &p->state, &p->ppid); +if (rc <0 ) goto done; - } rc =0 ;for (i =0 ; i <ARRAY_SIZE (p->ns_ids); i++) {
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
Quoted 2 lines · OGAWA Hirofumi
sys-utils/lsns.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
Applied, thanks.
Karel
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com