dma-buf: use SB_I_NOEXEC and SB_I_NODEV
Subsystems (2)
PATCH 1/1 dma-buf: use SB_I_NOEXEC and SB_I_NODEV
The dma-buf pseudo-filesystem should never have executable mappings nor device nodes. Set SB_I_NOEXEC and SB_I_NODEV on the superblock to enforce this at the filesystem level, similar to secretmem, commit 98f99394a104 ("secretmem: use SB_I_NOEXEC").
Fix the syzbot-reported warning from the exec code to enforce this requirement:
Quoted 4 lines
WARNING: CPU: 1 PID: 6000 at fs/exec.c:119 path_noexec+0x1af/0x200 fs/exec.c:118 Modules linked in: CPU: 1 UID: 0 PID: 6000 Comm: syz.0.17 Not tainted syzkaller #0 PREEMPT(full) RIP: 0010:path_noexec+0x1af/0x200 fs/exec.c:118
Quoted 8 lines
Call Trace: <TASK> do_mmap+0xa43/0x10d0 mm/mmap.c:469 vm_mmap_pgoff+0x2a6/0x4d0 mm/util.c:580 ksys_mmap_pgoff+0x51f/0x760 mm/mmap.c:604 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
---
Cc: Christian Brauner <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: [email protected]
Cc: <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
--- drivers/dma-buf/dma-buf.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/dma-buf/dma-buf.c +2 -0
@@ -189,6 +189,8 @@ static int dma_buf_fs_init_context(struct fs_context *fc) {struct pseudo_fs_context *ctx; + fc->s_iflags |=SB_I_NOEXEC ; + fc->s_iflags |=SB_I_NODEV ; ctx =init_pseudo (fc,DMA_BUF_MAGIC );if (!ctx)return -ENOMEM ;
Signature · 1 line
2.34.1
Quoted 7 lines · Kees Cook
The dma-buf pseudo-filesystem should never have executable mappings nor device nodes. Set
SB_I_NOEXECandSB_I_NODEVon the superblock to enforce this at the filesystem level, similar to secretmem, commit98f99394a104("secretmem: useSB_I_NOEXEC").Fix the syzbot-reported warning from the exec code to enforce this requirement:
Can you please just enforce this in init_pseudo? If a file system really wants to support devices or executable it can clear them, but a quick grep suggests that none of them should.
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Kees Cook
The dma-buf pseudo-filesystem should never have executable mappings nor device nodes. Set
SB_I_NOEXECandSB_I_NODEVon the superblock to enforce this at the filesystem level, similar to secretmem, commit98f99394a104("secretmem: useSB_I_NOEXEC").
Quoted 6 lines
Quoted 2 lines
Fix the syzbot-reported warning from the exec code to enforce this requirement:
Can you please just enforce this in
init_pseudo? If a file system really wants to support devices or executable it can clear them, but a quick grep suggests that none of them should.
I that that's a fine idea, but I defer to Christian -- I think the WARN was put in place to avoid doing that...
Signature · 1 line
Kees Cook