Skip to content

Commit

Permalink
lib/buildid: Handle memfd_secret() files in build_id_parse()
Browse files Browse the repository at this point in the history
>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]
  • Loading branch information
anakryiko authored and borkmann committed Oct 17, 2024
1 parent db123e4 commit 5ac9b4e
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lib/buildid.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <linux/elf.h>
#include <linux/kernel.h>
#include <linux/pagemap.h>
#include <linux/secretmem.h>

#define BUILD_ID 3

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

freader_put_folio(r);

/* reject secretmem folios created with memfd_secret() */
if (secretmem_mapping(r->file->f_mapping))
return -EFAULT;

r->folio = filemap_get_folio(r->file->f_mapping, file_off >> PAGE_SHIFT);

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

0 comments on commit 5ac9b4e

Please sign in to comment.