From patchwork Wed Jul 5 06:33:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 11618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1674200vqx; Tue, 4 Jul 2023 23:49:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Cs9gjGRmhaHUftSOH9U4kLrbk9lXkI+5V/RwzxqOy9ZhuYBCxC9AzLph7WiJ5kum/X6XW X-Received: by 2002:a05:6a20:9694:b0:107:35ed:28a7 with SMTP id hp20-20020a056a20969400b0010735ed28a7mr14874833pzc.8.1688539789168; Tue, 04 Jul 2023 23:49:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688539789; cv=none; d=google.com; s=arc-20160816; b=pVjvUvPnsN3CvLGZjgogb3Owe7ZtOnIN3ih4NRQ9Jdr7cCcY0+5lnp76PGr4hk/vog an0xm2CynmTNqrmiDKs2NWywJM3b3MfnJFmVhu5qyl6FkwTeL+K9ileK4vMkpljApHCb TeIUycAsSF6D21igKpgBfIkfIDq6bshN1Jpm3uyy+aIH5pgj/hJUrX8fQ2VWfhgGNsyN pixpPpf9yH5Nyy80ue6YDpE6/KBvd0dxea37Te3+wHcP4C7LNYS+8sKufHv4MEwHDEeZ Eq4dz0n4I5dF46hWSjCQaC+G4/7y4gjrQfUwFkO5nujR09EKaUKhLQ+uvjj/2n0ieajM 3Znw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=LDvL7ekfNs3bVJSGPqpDAjABE5c0UvJWFUFVDP7OcnI=; fh=+wFwOUChBMDyUEg63FIGralHY9qRggLvyZTCULGydUc=; b=qnBsMX2uLNYluVNYa8y5TzeM+reMTSK+TlCX0QJf18Amb7Q5J6Cr526dQqgz51e2BT GSXc4M9/oBR3pIvkMfiVKZGrLc91Vdoxi4UCSgItULa2W9aaRoJYilqvECex/fIodAzU 1/EAWQ68pRVCPCjOyqFKfniSBzhdltIzhhI0OlekIyAdhIOyvRfQ15ra1SFaVeHwx8a0 8+Ez+1LfZCFKVx97A8V0rEYtIje9TnNP0+NIThBcwbjHB6Cj1M9MaRW0C2wjVmLzlTBk mgV2BkNEtxjtH5KPx08bOsbjPWgPhlSnQpHW5hkgtydk6F3izBpV9LFknJgtao/lybqn 8TzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=HCLhgdyC; 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 ik2-20020a170902ab0200b001b03bacdc9dsi759346plb.343.2023.07.04.23.49.36; Tue, 04 Jul 2023 23:49:49 -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=HCLhgdyC; 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 S231608AbjGEGd0 (ORCPT + 99 others); Wed, 5 Jul 2023 02:33:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231455AbjGEGdY (ORCPT ); Wed, 5 Jul 2023 02:33:24 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 926B41712 for ; Tue, 4 Jul 2023 23:33:19 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-557790487feso4429653a12.0 for ; Tue, 04 Jul 2023 23:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1688538799; x=1691130799; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LDvL7ekfNs3bVJSGPqpDAjABE5c0UvJWFUFVDP7OcnI=; b=HCLhgdyCq90YfTQMjaZdIjt+ewIGHr1WoJsIV+nau37DwSwAOxCl2fjO89N/8iyvzE H7nphOWHQcnoXDeIAAzONINmvw/9M+OF7ptZ2nYwtk03J6Xr1VIAXJFgzI89yGveGEEn GqQXrdDg26hwQ58jRQ8CVFGH4yq7UNJvF82E0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688538799; x=1691130799; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LDvL7ekfNs3bVJSGPqpDAjABE5c0UvJWFUFVDP7OcnI=; b=kCE0y56NsLaiPX+t9PtFnNKr5hY+vNhFl+9zLw7bNqm1V/laBJphhayF+GKLRShqyn S+PraWWvNYQwEPqifcl1yCr5DeHmR+aJacGkiwK6DdsKhSi4qNLXW0OhdDvoAx741ea1 ng6F31QNQDMuzzDKrhntgEcBtxuwvdCFsLngqk/Ahf5wTWPAODItz/WEZuxb1z3abWCg bYL9PZEdP+Zttfb35B7Lnr71E7rahG/oaRkEmkS1Lq3VEPbczKXu0p8OAPWkeUrexckz FpR2xYQEf3KP10yT/9iJF6saHPYipogxeHbcmMlhseC0wgr5TZts0vv8gkY1vO50dY3v t63g== X-Gm-Message-State: ABy/qLZpvYi1FWFdg7a7mhokATVZBG6TV23E6Qv8JR0PFsk4LUcCs40R RmtJkGBjThUbhKT4S5RDUtjGqw== X-Received: by 2002:a05:6a20:8408:b0:12f:6500:8504 with SMTP id c8-20020a056a20840800b0012f65008504mr3750180pzd.46.1688538799000; Tue, 04 Jul 2023 23:33:19 -0700 (PDT) Received: from localhost (183.43.230.35.bc.googleusercontent.com. [35.230.43.183]) by smtp.gmail.com with UTF8SMTPSA id u23-20020aa78497000000b0067aa2a70179sm13271590pfn.46.2023.07.04.23.33.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Jul 2023 23:33:18 -0700 (PDT) From: jeffxu@chromium.org To: skhan@linuxfoundation.org, keescook@chromium.org Cc: akpm@linux-foundation.org, dmitry.torokhov@gmail.com, dverkamp@chromium.org, asmadeus@codewreck.org, hughd@google.com, jeffxu@google.com, jorgelo@chromium.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, jannh@google.com, linux-hardening@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v2 0/2] mm/memfd: fix sysctl MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED Date: Wed, 5 Jul 2023 06:33:13 +0000 Message-ID: <20230705063315.3680666-1-jeffxu@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog 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=ham 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?1770562297981613906?= X-GMAIL-MSGID: =?utf-8?q?1770562297981613906?= From: Jeff Xu When sysctl vm.memfd_noexec is 2 (MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED), memfd_create(.., MFD_EXEC) should fail. This complies with how MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED is defined - "memfd_create() without MFD_NOEXEC_SEAL will be rejected" Thanks to Dominique Martinet who reported the bug. see [1] for context. [1] https://lore.kernel.org/linux-mm/CABi2SkXUX_QqTQ10Yx9bBUGpN1wByOi_=gZU6WEy5a8MaQY3Jw@mail.gmail.com/T/ History: V2: fix build error when CONFIG_SYSCTL is not defined. V1: initial version https://lore.kernel.org/linux-mm/20230630031721.623955-3-jeffxu@google.com/T/ Jeff Xu (2): mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED selftests/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED mm/memfd.c | 57 +++++++++++++--------- tools/testing/selftests/memfd/memfd_test.c | 5 ++ 2 files changed, 38 insertions(+), 24 deletions(-)