Skip to contentSkip to conversation

fs-procfs-remove-build-id-related-code-duplication-in-procmap_query.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Sep 2, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: fs/procfs: remove build ID-related code duplication in PROCMAP_QUERY
has been removed from the -mm tree. Its filename was
fs-procfs-remove-build-id-related-code-duplication-in-procmap_query.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Andrii Nakryiko <[email protected]>
Subject: fs/procfs: remove build ID-related code duplication in PROCMAP_QUERY
Date: Mon, 29 Jul 2024 10:40:44 -0700

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.

Fixes ed5d583a88a9 ("fs/procfs: implement efficient VMA querying API for /proc/<pid>/maps")
Cc Alexey Dobriyan <[email protected]>

---

 fs/proc/task_mmu.c |   15 ---------------
 1 file changed, 15 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~fs-procfs-remove-build-id-related-code-duplication-in-procmap_query +0 -15
@@ -543,21 +543,6 @@ static int do_procmap_query(struct proc_
 		}
 	}
 
-	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;

_

Patches currently in -mm which might be from [email protected] are