Hi Topi, On Wed, Apr 13, 2022 at 09:39:37PM +0300, Topi Miettinen wrote: > On 13.4.2022 16.49, Catalin Marinas wrote: > > The background to this is that systemd has a configuration option called > > MemoryDenyWriteExecute [1], implemented as a SECCOMP BPF filter. Its aim > > is to prevent a user task from inadvertently creating an executable > > mapping that is (or was) writeable. Since such BPF filter is stateless, > > it cannot detect mappings that were previously writeable but > > subsequently changed to read-only. Therefore the filter simply rejects > > any mprotect(PROT_EXEC). The side-effect is that on arm64 with BTI > > support (Branch Target Identification), the dynamic loader cannot change > > an ELF section from PROT_EXEC to PROT_EXEC|PROT_BTI using mprotect(). > > For libraries, it can resort to unmapping and re-mapping but for the > > main executable it does not have a file descriptor. The original bug > > report in the Red Hat bugzilla - [2] - and subsequent glibc workaround > > for libraries - [3]. > > > > Add in-kernel support for such feature as a DENY_WRITE_EXEC personality > > flag, inherited on fork() and execve(). The kernel tracks a previously > > writeable mapping via a new VM_WAS_WRITE flag (64-bit only > > architectures). BTW, we can avoid the VM_WAS_WRITE tracking if we limit the check to the current permissions. It would allow mprotect(PROT_EXEC) only if the mapping is already executable. The mmap(PROT_WRITE|PROT_EXEC) would be rejected, as expected. The difference from the current BPF filter is that mprotect(PROT_EXEC|PROT_BTI) is allowed if the mapping was previously mmap(PROT_READ|PROT_EXEC). I'm open to go in this direction if it fits the systemd requirements better. It's also less state to track in the kernel. > > I went for a personality flag by analogy with the > > READ_IMPLIES_EXEC one. However, I'm happy to change it to a prctl() if > > we don't want more personality flags. A minor downside with the > > personality flag is that there is no way for the user to query which > > flags are supported, so in patch 3 I added an AT_FLAGS bit to advertise > > this. > > With systemd there's a BPF construct to block personality changes > (LockPersonality=yes) but I think prctl() would be easier to lock down > irrevocably. The personality flag is not sticky, so one could inadvertently clear it without LockPersonality=yes. We could add a mask of sticky bits to sys_personality() (only for new flags), though we might as well go with a prctl(), we have more flexibility and finer-grained control if we want to expand this to memfd files. Would there be any reason to disable such behaviour for an application, once enabled? I don't think it's currently possible with the BPF filter but we can add it to a prctl(). > > Posting this as an RFC to start a discussion and cc'ing some of the > > systemd guys and those involved in the earlier thread around the glibc > > workaround for dynamic libraries [4]. Before thinking of upstreaming > > this we'd need the systemd folk to buy into replacing the MDWE SECCOMP > > BPF filter with the in-kernel one. > > As the author of this feature in systemd (also similar feature in Firejail), > I'd highly prefer in-kernel version to BPF protection. I'd definitely also > want to use this in place of BPF on x86_64 and other arches too. It is generic, so yes, it can be enabled for other architectures. A minor issue with the VM_WAS_WRITE flag is that we ran out of 32-bit vma flags. It could be expanded but not sure how much you care about MDWE on 32-bit architectures. An alternative is to drop the VM_WAS_WRITE approach entirely, just use the current protection for the decision. > In-kernel version would probably allow covering pretty easily this case > (maybe it already does): > > fd = memfd_create(...); > write(fd, malicious_code, sizeof(malicious_code)); > mmap(..., PROT_EXEC, ..., fd); This series doesn't cover it. > Other memory W^X implementations include S.A.R.A [1] and SELinux > EXECMEM/EXECSTACK/EXECHEAP protections [2], [3]. SELinux checks > IS_PRIVATE(file_inode(file)) and vma->anon_vma != NULL, which might be > useful additions here too (or future extensions if you prefer). I had a quick look at SELinux and, IIUC, without the execmem permission it prevents any anonymous mmap(PROT_EXEC). We could probably do something similar here and check the file permission. I had an attempt but S_PRIVATE doesn't seem to be set on the memfd_create() allocated inode. I have to dig a bit more to see how to detect this. If we keep the check for all files, it won't be able to map any ELF text sections unless the binary is read-only. > [1] https://smeso.it/sara/ > [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/security/selinux/hooks.c#n3708 > [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/security/selinux/hooks.c#n3787 -- Catalin
