Skip to content

Commit 5ac9b4e

Browse files
anakryikoborkmann
authored andcommitted
lib/buildid: Handle memfd_secret() files in build_id_parse()
>From memfd_secret(2) manpage: The memory areas backing the file created with memfd_secret(2) are visible only to the processes that have access to the file descriptor. The memory region is removed from the kernel page tables and only the page tables of the processes holding the file descriptor map the corresponding physical memory. (Thus, the pages in the region can't be accessed by the kernel itself, so that, for example, pointers to the region can't be passed to system calls.) We need to handle this special case gracefully in build ID fetching code. Return -EFAULT whenever secretmem file is passed to build_id_parse() family of APIs. Original report and repro can be found in [0]. [0] https://lore.kernel.org/bpf/ZwyG8Uro%2FSyTXAni@ly-workstation/ Fixes: de3ec36 ("lib/buildid: add single folio-based file reader abstraction") Reported-by: Yi Lai <[email protected]> Suggested-by: Shakeel Butt <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Acked-by: Shakeel Butt <[email protected]> Link: https://lore.kernel.org/bpf/[email protected] Link: https://lore.kernel.org/bpf/[email protected]
1 parent db123e4 commit 5ac9b4e

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

lib/buildid.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <linux/elf.h>
66
#include <linux/kernel.h>
77
#include <linux/pagemap.h>
8+
#include <linux/secretmem.h>
89

910
#define BUILD_ID 3
1011

@@ -64,6 +65,10 @@ static int freader_get_folio(struct freader *r, loff_t file_off)
6465

6566
freader_put_folio(r);
6667

68+
/* reject secretmem folios created with memfd_secret() */
69+
if (secretmem_mapping(r->file->f_mapping))
70+
return -EFAULT;
71+
6772
r->folio = filemap_get_folio(r->file->f_mapping, file_off >> PAGE_SHIFT);
6873

6974
/* if sleeping is allowed, wait for the page, if necessary */

0 commit comments

Comments
 (0)