]> www.infradead.org Git - users/hch/misc.git/commitdiff
lib/buildid: Handle memfd_secret() files in build_id_parse()
authorAndrii Nakryiko <andrii@kernel.org>
Thu, 17 Oct 2024 17:47:13 +0000 (10:47 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 17 Oct 2024 19:30:32 +0000 (21:30 +0200)
>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: de3ec364c3c3 ("lib/buildid: add single folio-based file reader abstraction")
Reported-by: Yi Lai <yi1.lai@intel.com>
Suggested-by: Shakeel Butt <shakeel.butt@linux.dev>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Link: https://lore.kernel.org/bpf/20241017175431.6183-A-hca@linux.ibm.com
Link: https://lore.kernel.org/bpf/20241017174713.2157873-1-andrii@kernel.org
lib/buildid.c

index 290641d92ac176ca56fa009fa77383e0d5c24753..c4b0f376fb3410beac1e5223e3afdf85c7e16b81 100644 (file)
@@ -5,6 +5,7 @@
 #include <linux/elf.h>
 #include <linux/kernel.h>
 #include <linux/pagemap.h>
+#include <linux/secretmem.h>
 
 #define BUILD_ID 3
 
@@ -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 */