fs/procfs: remove build ID-related code duplication in PROCMAP_QUERY

PATCH Applied Andrii Nakryiko 1 participant 1 message Jul 29, 2024

Subsystems (4)

Memory management VFS Proc filesystem Memory mapping

lore

Share & tools

lore

Andrii Nakryiko

author

2024-07-29 17:40 UTC #0 lore raw

PATCH 1/1 fs/procfs: remove build ID-related code duplication in PROCMAP_QUERY

A piece of build ID handling code in PROCMAP_QUERY ioctl() was accidentally duplicated. It wasn't meant to be part of
ed5d583a88a9 ("fs/procfs: implement efficient VMA querying API for /proc/<pid>/maps") commit, which is what introduced duplication.

It has no correctness implications, but we unnecessarily perform the same work twice, if build ID parsing is requested. Drop the duplication.

Reported-by Jann Horn <[email protected]>

Fixes ed5d583a88a9 ("fs/procfs: implement efficient VMA querying API for /proc/<pid>/maps")

Signed-off-by Andrii Nakryiko <[email protected]>

---
 fs/proc/task_mmu.c | 15 ---------------
 1 file changed, 15 deletions(-)

fs/proc/task_mmu.c +0 ~~-15~~

index 5f171ad7b436..3ba613052506 100644
@@ -543,21 +543,6 @@ static int do_procmap_query(struct proc_maps_private *priv, void __user *uarg)
 		}
 	}
 
-	if (karg.build_id_size) {
-		__u32 build_id_sz;
-
-		err = build_id_parse(vma, build_id_buf, &build_id_sz);
-		if (err) {
-			karg.build_id_size = 0;
-		} else {
-			if (karg.build_id_size < build_id_sz) {
-				err = -ENAMETOOLONG;
-				goto out;
-			}
-			karg.build_id_size = build_id_sz;
-		}
-	}
-
 	if (karg.vma_name_size) {
 		size_t name_buf_sz = min_t(size_t, PATH_MAX, karg.vma_name_size);
 		const struct path *path;

Signature · 1 line

2.43.0