lib/buildid: handle memfd_secret() files in build_id_parse()
Subsystems (5)
Andrii Nakryiko
maintainerPATCH 1/1 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 -EACCESS 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/
--- lib/buildid.c | 5 +++++ 1 file changed, 5 insertions(+)
lib/buildid.c +5 -0
@@ -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 -EACCES ; + r->folio =filemap_get_folio (r->file->f_mapping, file_off >>PAGE_SHIFT );/* if sleeping is allowed, wait for the page, if necessary */
Signature · 1 line
2.43.5
Quoted 14 lines · Andrii Nakryiko
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
-EACCESSwhenever secretmem file is passed tobuild_id_parse()family of APIs. Original report and repro can be found in [0].
Quoted 6 lines
[0] https://lore.kernel.org/bpf/ZwyG8Uro%2FSyTXAni@ly-workstation/
Reported-by Yi Lai <[email protected]>Suggested-by Shakeel Butt <[email protected]>Fixes de3ec364c3c3 ("lib/buildid: add single folio-based file reader abstraction")Signed-off-by Andrii Nakryiko <[email protected]>
Ccing couple more folks who are doing similar work (ASI, guest_memfd)
Folks, what is the generic way to check if a given mapping has folios unmapped from kernel address space?
Quoted 50 lines · Andrii Nakryiko
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
-EACCESSwhenever secretmem file is passed tobuild_id_parse()family of APIs. Original report and repro can be found in [0].[0] https://lore.kernel.org/bpf/ZwyG8Uro%2FSyTXAni@ly-workstation/
Reported-by Yi Lai <[email protected]>Suggested-by Shakeel Butt <[email protected]>Fixes de3ec364c3c3 ("lib/buildid: add single folio-based file reader abstraction")Signed-off-by Andrii Nakryiko <[email protected]>--- lib/buildid.c | 5 +++++ 1 file changed, 5 insertions(+)lib/buildid.c +5
-0@@ -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 -EACCES ; + r->folio =filemap_get_folio (r->file->f_mapping, file_off >>PAGE_SHIFT );/* if sleeping is allowed, wait for the page, if necessary */ Signature · 1 line
2.43.5
Quoted 5 lines · Shakeel Butt
Ccing couple more folks who are doing similar work (ASI,
guest_memfd)Folks, what is the generic way to check if a given mapping has folios unmapped from kernel address space?
I suppose you mean specifically if a folio is not mapped in the direct map, because a folio can also be mapped in other regions of the kernel address space (e.g. vmalloc).
From my perspective of working on ASI on the x86 side, I think lookup_address() is
the right API to use. It returns a PTE and you can check if it is present.
Based on that, I would say that the generic way is perhaps kernel_page_present(), which does the above on x86, not sure about other architectures. It seems like kernel_page_present() always returns true with !CONFIG_ARCH_HAS_SET_DIRECT_MAP, which assumes that unmapping folios from the direct map uses set_direct_map_*().
For secretmem, it seems like set_direct_map_*() is indeed the method used to unmap folios. I am not sure if the same stands for guest_memfd, but I don't see why not.
ASI does not use set_direct_map_*(), but it doesn't matter in this context, read below if you care about the reasoning.
ASI does not unmap folios from the direct map in the kernel address space, but it creates a new "restricted" address space that has the folios unmapped from the direct map by default. However, I don't think this is relevant here. IIUC, the purpose of this patch is to check if the folio is accessible by the kernel, which should be true even in the ASI restricted address space, because ASI will just transparently switch to the unrestricted kernel address space where the folio is mapped if needed.
I hope this helps.
Quoted 52 lines · Andrii Nakryiko
Quoted 50 lines
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
-EACCESSwhenever secretmem file is passed tobuild_id_parse()family of APIs. Original report and repro can be found in [0].[0] https://lore.kernel.org/bpf/ZwyG8Uro%2FSyTXAni@ly-workstation/
Reported-by Yi Lai <[email protected]>Suggested-by Shakeel Butt <[email protected]>Fixes de3ec364c3c3 ("lib/buildid: add single folio-based file reader abstraction")Signed-off-by Andrii Nakryiko <[email protected]>--- lib/buildid.c | 5 +++++ 1 file changed, 5 insertions(+)lib/buildid.c +5
-1@@ -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 -EACCES ; + r->folio =filemap_get_folio (r->file->f_mapping, file_off >>PAGE_SHIFT );/* if sleeping is allowed, wait for the page, if necessary */ --2.43.5
Quoted 38 lines · Yosry Ahmed
Quoted 5 lines · Shakeel Butt
Ccing couple more folks who are doing similar work (ASI,
guest_memfd)Folks, what is the generic way to check if a given mapping has folios unmapped from kernel address space?
I suppose you mean specifically if a folio is not mapped in the direct map, because a folio can also be mapped in other regions of the kernel address space (e.g. vmalloc).
From my perspective of working on ASI on the x86 side, I think
lookup_address()is
the right API to use. It returns a PTE and you can check if it is present.Based on that, I would say that the generic way is perhaps
kernel_page_present(), which does the above on x86, not sure about other architectures. It seems likekernel_page_present()always returns true with !CONFIG_ARCH_HAS_SET_DIRECT_MAP, which assumes that unmapping folios from the direct map uses set_direct_map_*().For secretmem, it seems like set_direct_map_*() is indeed the method used to unmap folios. I am not sure if the same stands for
guest_memfd, but I don't see why not.ASI does not use set_direct_map_*(), but it doesn't matter in this context, read below if you care about the reasoning.
ASI does not unmap folios from the direct map in the kernel address space, but it creates a new "restricted" address space that has the folios unmapped from the direct map by default. However, I don't think this is relevant here. IIUC, the purpose of this patch is to check if the folio is accessible by the kernel, which should be true even in the ASI restricted address space, because ASI will just transparently switch to the unrestricted kernel address space where the folio is mapped if needed.
Quoted 2 lines
I hope this helps.
Thanks a lot. This is really helpful.
Quoted 4 lines · Shakeel Butt
Ccing couple more folks who are doing similar work (ASI,
guest_memfd)Folks, what is the generic way to check if a given mapping has folios unmapped from kernel address space?
Can't we just lookup the mapping and refuse these folios that really shouldn't be looked at?
See gup_fast_folio_allowed() where we refuse secretmem_mapping().
Signature · 3 lines
Cheers, David / dhildenb
Quoted 11 lines · David Hildenbrand
Quoted 4 lines · Shakeel Butt
Ccing couple more folks who are doing similar work (ASI,
guest_memfd)Folks, what is the generic way to check if a given mapping has folios unmapped from kernel address space?
Can't we just lookup the mapping and refuse these folios that really shouldn't be looked at?
See
gup_fast_folio_allowed()where we refusesecretmem_mapping().
That is exactly what this patch is doing. See [1]. The reason I asked this question was because I see parallel efforts related to guest_memfd and ASI are going to unmap folios from direct map. (Yosry already explained ASI is a bit different). We want a more robust and future proof solution.
[1] https://lore.kernel.org/all/[email protected]/
Quoted 7 lines
Signature · 4 lines
-- Cheers, David / dhildenb
Quoted 8 lines · Shakeel Butt
Quoted 7 lines · David Hildenbrand
Quoted 4 lines · Shakeel Butt
Ccing couple more folks who are doing similar work (ASI,
guest_memfd)Folks, what is the generic way to check if a given mapping has folios unmapped from kernel address space?
Quoted 6 lines
Quoted 4 lines
Can't we just lookup the mapping and refuse these folios that really shouldn't be looked at?
See
gup_fast_folio_allowed()where we refusesecretmem_mapping().That is exactly what this patch is doing. See [1].
Hah! I should have looked at the full patch not just the discussion where I was CCed :)
Quoted 5 lines
The reason I asked
this question was because I see parallel efforts related toguest_memfdand ASI are going to unmap folios from direct map. (Yosry already explained ASI is a bit different). We want a more robust and future proof solution.
There was a discussion a while ago about having the abstraction of inaccessible mappings.
See https://lore.kernel.org/all/[email protected]/
It would be a more future-proof replacement of the secretmem checks.
Signature · 3 lines
Cheers, David / dhildenb