From patchwork Fri May 19 01:19:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 96158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp913018vqo; Thu, 18 May 2023 18:27:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7nIB/G5J+zA0vZBD65a6F2yidSO2Upg1jxPtO3WPs1OXCLOwqYjmQqVl8ZoU/M5Xfj2a9T X-Received: by 2002:a17:902:d2c2:b0:1ac:b4db:6a62 with SMTP id n2-20020a170902d2c200b001acb4db6a62mr867982plc.65.1684459666197; Thu, 18 May 2023 18:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684459666; cv=none; d=google.com; s=arc-20160816; b=mPPxQ1pZOurjOSGjVnpFNsPf0BRU0PTVNVoYr3cxuC5kqtgJiJfOw1q8KHOSPqEj/k imarxhTOA8syvdd8NtQcJru0vRfwrsSRxy/fzX4eGTXum1v2xY2ENtbWuzM0amjyMoHQ BQ7Qv4gdimg2TfQshkSMBGP71Ndy2ShKf1Mr7KS877ZBGdMlJkRCy8hDuyTJapWbg4zi qCS4meec7Cjnnrle4s1ikBnGw2/ETesEhP3JeOn8eHDcaQtWYo7wL3itzJklJDJYAgWZ oD2J5MxU+TNifAu+Li8g9o3cz2/SfTUWKNplNBDXhhORKWoevDV2VxY2eTatWaD7gPQu 1W1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DlYfhs3BTQ2EJ5c00OoF7xAAokRQfPc4lQTpfzHm9OE=; b=YcZSMmxk7tQdjI88rywHGM5hbrCnq9rk3RwctwepSOyaRxRf1qkOcegoJjohM4RPZk PbRBiQp25XUPSLCkQ4F3Qa19/zxlIiNg5ZbFocA0vH2Qvrm6aQ/FUIpH0ah66HAaxMFd 4svtmQ/G1TTYMZL44EgPvFySoStZAgo9v2uIO/2GIynthcxd9epTavcV+HyrQG66P8Ay dETpWw7S7ZGuoJFHymMJ4VfnWbOa5p2XmtJJ5iKmMEYWJeTqBygZurcNS7Zj1eSKcNB6 RMPl2+HcbNlhp6YxD77wwvOQ0MTZUpSDj/UDpGLmai5exQ9Uyp1HWBSqGZ7om4fxgY6m FRyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JWIfslA4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ja2-20020a170902efc200b0019e9c8e51f4si2490169plb.165.2023.05.18.18.27.33; Thu, 18 May 2023 18:27:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JWIfslA4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230338AbjESBTj (ORCPT + 99 others); Thu, 18 May 2023 21:19:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230469AbjESBTc (ORCPT ); Thu, 18 May 2023 21:19:32 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 448B9E72 for ; Thu, 18 May 2023 18:19:30 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-64384c6797eso2123267b3a.2 for ; Thu, 18 May 2023 18:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684459169; x=1687051169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DlYfhs3BTQ2EJ5c00OoF7xAAokRQfPc4lQTpfzHm9OE=; b=JWIfslA4UKDBw1Mp583btzlGGK8G9E6xpS7M8yt3iOyE0agyVlu+KO5Lxq4vpucXSU HH1YA4BQeb7OL6OLVkoix4UxlcxXNVOrDy2c5gWBw82vyYqfMb8tY9sDkBb9j+Na0b8j 0kO3Cd+a0jrUOyQcvN7J2vDvvbkTYN/CiGCqY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684459169; x=1687051169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DlYfhs3BTQ2EJ5c00OoF7xAAokRQfPc4lQTpfzHm9OE=; b=V//B6ophZ5yr9JHjcjv3IKtm7+vuUba87wbJjHW+fePx7g/Yq+OhYDXpZXsguEduWp YbOJpBp16/5SgO23NsBy55WPLtsNXGTjdiAQ0WIy9PqIUEMtPsHmMeXbnj8V9uv9/7Fz vewyOptKPqTIZyJOSQzoLiWtde9MNjaHl4esXbpM6RMkcMKhTbKh4Mok84gcxZc4kPli R+UfOAA6E8sfdIDYqnM5bgKyqUToITMAztq7eon067hxQiiX9n9JEjtRD7QHWsBMFe2d eW+GTYwhejM+0CXSAP0k/zBBQdphURQpx3BVyTy/sk5GUowKCn46IOICadbrwY3k8AjU 8JaA== X-Gm-Message-State: AC+VfDzpR/CkQ581DYwNYnHoLo1uIUvKF2M/cl88Z64AsVdjGHIFvZqY WYhgScwPFGsI+xQF45eaVU0wGw== X-Received: by 2002:a05:6a20:8422:b0:ef:205f:8184 with SMTP id c34-20020a056a20842200b000ef205f8184mr425525pzd.13.1684459169739; Thu, 18 May 2023 18:19:29 -0700 (PDT) Received: from localhost (183.43.230.35.bc.googleusercontent.com. [35.230.43.183]) by smtp.gmail.com with UTF8SMTPSA id c24-20020a62e818000000b00643864d03dfsm1960424pfi.171.2023.05.18.18.19.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 May 2023 18:19:29 -0700 (PDT) From: jeffxu@chromium.org To: dave.hansen@intel.com, luto@kernel.org, jorgelo@chromium.org, keescook@chromium.org, groeck@chromium.org, jannh@google.com, sroettger@google.com Cc: akpm@linux-foundation.org, jeffxu@google.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org Subject: [PATCH v1 3/6] PKEY: Apply PKEY_ENFORCE_API to mprotect Date: Fri, 19 May 2023 01:19:11 +0000 Message-ID: <20230519011915.846407-4-jeffxu@chromium.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230519011915.846407-1-jeffxu@chromium.org> References: <20230519011915.846407-1-jeffxu@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766283979177006738?= X-GMAIL-MSGID: =?utf-8?q?1766283979177006738?= From: Jeff Xu This patch enables PKEY_ENFORCE_API for the mprotect and mprotect_pkey syscalls. Signed-off-by: Jeff Xu --- mm/mprotect.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mm/mprotect.c b/mm/mprotect.c index 8a68fdca8487..1db30b8baac3 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -794,6 +794,17 @@ static int do_mprotect_pkey(unsigned long start, size_t len, } } + /* + * arch_check_pkey_enforce_api checks if current thread + * has the PKEY permission to modify the memory mapping. + * Note: this should only apply to the cases that do_mprotect_pkey + * is called from syscall entry. Ref. to munmap for other cases. + */ + if (arch_check_pkey_enforce_api(current->mm, start, end) < 0) { + error = -EACCES; + goto out; + } + prev = vma_prev(&vmi); if (start > vma->vm_start) prev = vma;