Blame SOURCES/0136-Use-get_proc_pid-for-proc-paths.patch

b4ec74
From bba566504901b2c07885ecf325829875a96381a7 Mon Sep 17 00:00:00 2001
b4ec74
From: =?UTF-8?q?=C3=81kos=20Uzonyi?= <uzonyi.akos@gmail.com>
b4ec74
Date: Tue, 30 Jun 2020 17:20:12 +0200
b4ec74
Subject: [PATCH 136/138] Use get_proc_pid for /proc paths
b4ec74
b4ec74
* mmap_cache.c (mmap_cache_rebuild_if_invalid): Use proc pid instead of
b4ec74
tcp->pid for /proc path.
b4ec74
* util.c (getfdproto): Likewise.
b4ec74
(pidfd_get_pid): Likewise.
b4ec74
* pathtrace.c (getfdpath_pid): Likewise.
b4ec74
* strace.c (attach_tcb): Likewise.
b4ec74
---
b4ec74
 mmap_cache.c | 2 +-
b4ec74
 pathtrace.c  | 7 ++++++-
b4ec74
 strace.c     | 2 +-
b4ec74
 util.c       | 9 +++++++--
b4ec74
 4 files changed, 15 insertions(+), 5 deletions(-)
b4ec74
b4ec74
diff --git a/mmap_cache.c b/mmap_cache.c
b4ec74
index 89c6225..9825df2 100644
b4ec74
--- a/mmap_cache.c
b4ec74
+++ b/mmap_cache.c
b4ec74
@@ -84,7 +84,7 @@ mmap_cache_rebuild_if_invalid(struct tcb *tcp, const char *caller)
b4ec74
 		return MMAP_CACHE_REBUILD_READY;
b4ec74
 
b4ec74
 	char filename[sizeof("/proc/4294967296/maps")];
b4ec74
-	xsprintf(filename, "/proc/%u/maps", tcp->pid);
b4ec74
+	xsprintf(filename, "/proc/%u/maps", get_proc_pid(tcp));
b4ec74
 
b4ec74
 	FILE *fp = fopen_stream(filename, "r");
b4ec74
 	if (!fp) {
b4ec74
diff --git a/pathtrace.c b/pathtrace.c
b4ec74
index f85cf14..87dc64b 100644
b4ec74
--- a/pathtrace.c
b4ec74
+++ b/pathtrace.c
b4ec74
@@ -87,7 +87,12 @@ getfdpath_pid(pid_t pid, int fd, char *buf, unsigned bufsize)
b4ec74
 	if (fd < 0)
b4ec74
 		return -1;
b4ec74
 
b4ec74
-	xsprintf(linkpath, "/proc/%u/fd/%u", pid, fd);
b4ec74
+	int proc_pid = 0;
b4ec74
+	translate_pid(NULL, pid, PT_TID, &proc_pid);
b4ec74
+	if (!proc_pid)
b4ec74
+		return -1;
b4ec74
+
b4ec74
+	xsprintf(linkpath, "/proc/%u/fd/%u", proc_pid, fd);
b4ec74
 	n = readlink(linkpath, buf, bufsize - 1);
b4ec74
 	/*
b4ec74
 	 * NB: if buf is too small, readlink doesn't fail,
b4ec74
diff --git a/strace.c b/strace.c
b4ec74
index 249533e..ef23f08 100644
b4ec74
--- a/strace.c
b4ec74
+++ b/strace.c
b4ec74
@@ -1196,7 +1196,7 @@ attach_tcb(struct tcb *const tcp)
b4ec74
 	unsigned int ntid = 0, nerr = 0;
b4ec74
 
b4ec74
 	if (followfork && tcp->pid != strace_child &&
b4ec74
-	    xsprintf(procdir, task_path, tcp->pid) > 0 &&
b4ec74
+	    xsprintf(procdir, task_path, get_proc_pid(tcp)) > 0 &&
b4ec74
 	    (dir = opendir(procdir)) != NULL) {
b4ec74
 		struct_dirent *de;
b4ec74
 
b4ec74
diff --git a/util.c b/util.c
b4ec74
index 2568021..481144b 100644
b4ec74
--- a/util.c
b4ec74
+++ b/util.c
b4ec74
@@ -501,7 +501,7 @@ getfdproto(struct tcb *tcp, int fd)
b4ec74
 	if (fd < 0)
b4ec74
 		return SOCK_PROTO_UNKNOWN;
b4ec74
 
b4ec74
-	xsprintf(path, "/proc/%u/fd/%u", tcp->pid, fd);
b4ec74
+	xsprintf(path, "/proc/%u/fd/%u", get_proc_pid(tcp), fd);
b4ec74
 	r = getxattr(path, "system.sockprotoname", buf, bufsize - 1);
b4ec74
 	if (r <= 0)
b4ec74
 		return SOCK_PROTO_UNKNOWN;
b4ec74
@@ -582,8 +582,13 @@ printdev(struct tcb *tcp, int fd, const char *path)
b4ec74
 pid_t
b4ec74
 pidfd_get_pid(pid_t pid_of_fd, int fd)
b4ec74
 {
b4ec74
+	int proc_pid = 0;
b4ec74
+	translate_pid(NULL, pid_of_fd, PT_TID, &proc_pid);
b4ec74
+	if (!proc_pid)
b4ec74
+		return -1;
b4ec74
+
b4ec74
 	char fdi_path[sizeof("/proc/%u/fdinfo/%u") + 2 * sizeof(int) * 3];
b4ec74
-	xsprintf(fdi_path, "/proc/%u/fdinfo/%u", pid_of_fd, fd);
b4ec74
+	xsprintf(fdi_path, "/proc/%u/fdinfo/%u", proc_pid, fd);
b4ec74
 
b4ec74
 	FILE *f = fopen_stream(fdi_path, "r");
b4ec74
 	if (!f)
b4ec74
-- 
b4ec74
2.1.4
b4ec74