linux-kernel - [RFC PATCH v2 4/8] mseal: Check seal flag for mprotect(2)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231017090815.1067790-5-jeffxu@chromium.org>
Date:   Tue, 17 Oct 2023 09:08:11 +0000
From:   jeffxu@...omium.org
To:     akpm@...ux-foundation.org, keescook@...omium.org, jannh@...gle.com,
        sroettger@...gle.com, willy@...radead.org,
        gregkh@...uxfoundation.org, torvalds@...ux-foundation.org
Cc:     jeffxu@...gle.com, jorgelo@...omium.org, groeck@...omium.org,
        linux-kernel@...r.kernel.org, linux-kselftest@...r.kernel.org,
        linux-mm@...ck.org, surenb@...gle.com, alex.sierra@....com,
        apopple@...dia.com, aneesh.kumar@...ux.ibm.com,
        axelrasmussen@...gle.com, ben@...adent.org.uk,
        catalin.marinas@....com, david@...hat.com, dwmw@...zon.co.uk,
        ying.huang@...el.com, hughd@...gle.com, joey.gouly@....com,
        corbet@....net, wangkefeng.wang@...wei.com,
        Liam.Howlett@...cle.com, lstoakes@...il.com, mawupeng1@...wei.com,
        linmiaohe@...wei.com, namit@...are.com, peterx@...hat.com,
        peterz@...radead.org, ryan.roberts@....com, shr@...kernel.io,
        vbabka@...e.cz, xiujianfeng@...wei.com, yu.ma@...el.com,
        zhangpeng362@...wei.com, dave.hansen@...el.com, luto@...nel.org,
        linux-hardening@...r.kernel.org
Subject: [RFC PATCH v2 4/8] mseal: Check seal flag for mprotect(2)

From: Jeff Xu <jeffxu@...gle.com>

mprotect(2) changes protection of VMAs in the given address
range. Sealing will prevent unintended mprotect call.

What this patch does:
When a mprotect(2) is invoked, if one of its VMAs has MM_SEAL_MPROTECT
set from previous mseal(2) call, this mprotect(2) will fail, without
any VMA modified.

This patch is based on following:
1. do_mprotect_pkey() currently called in two places:
SYSCALL_DEFINE3(mprotect,...)
SYSCALL_DEFINE4(pkey_mprotect, ...)
and not in any other places, therefore omit changing the signature of
do_mprotect_pkey(), i.e. not passing checkSeals flag.

2. In do_mprotect_pkey(), calls can_modify_mm() before any
update is made on the VMAs.

Signed-off-by: Jeff Xu <jeffxu@...gle.com>
---
 mm/mprotect.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 130db91d3a8c..6321c4d0aa3f 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -32,6 +32,7 @@
 #include <linux/sched/sysctl.h>
 #include <linux/userfaultfd_k.h>
 #include <linux/memory-tiers.h>
+#include <uapi/linux/mman.h>
 #include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
@@ -753,6 +754,20 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
 		}
 	}
 
+       /*
+	* do_mprotect_pkey() currently called from two places:
+	* SYSCALL_DEFINE3(mprotect,...)
+	* SYSCALL_DEFINE4(pkey_mprotect, ...)
+	* and not from other places.
+	* Therefore, omit changing the signature of do_mprotect_pkey().
+	* Otherwise, we might need to add checkSeals and pass it
+	* from all callers of do_mprotect_pkey().
+	*/
+	if (!can_modify_mm(current->mm, start, end, MM_SEAL_MPROTECT)) {
+		error = -EACCES;
+		goto out;
+	}
+
 	prev = vma_prev(&vmi);
 	if (start > vma->vm_start)
 		prev = vma;
-- 
2.42.0.655.g421f12c284-goog