From patchwork Fri Jun 30 03:17:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 114542 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10073504vqr; Thu, 29 Jun 2023 20:27:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlGKiw/wKz9jKgZfUL811dRWxB0SDxBYkaD967mtpp8KYrCqDIxjwBVvjl44+gExlRJtR70n X-Received: by 2002:a17:90b:890:b0:262:e6a9:bf1 with SMTP id bj16-20020a17090b089000b00262e6a90bf1mr1376505pjb.1.1688095677356; Thu, 29 Jun 2023 20:27:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688095677; cv=none; d=google.com; s=arc-20160816; b=up7gXP3AQsseQ2ETi0jVInGFVWX2U4qXtsJT6wOdrakOtXV1P54rwXCdH80gHMW85Y CmF6lcedMDZpLDUk/3ibMIBihpUdcVOEUAh629PM9msOWm5U27yRYUBk3uMeCEAc/+vy k6PY8czqr3Dbm1g4JOEIBYL3kV86pR2bwm430yrplgTeigzOqOLYnG1fDzTtZIUMtFQF Vk/NmIRkuwwHVvuBgemUFcE7kIyTIbnB4ddgLlp82L/qVVh9IuVygW9L1HpRW9PEQ1mf 82+hHkwCQRjlc+OeQK9tA3WCOGmUoyKIbh4+9LrzbRCf1saRrhYQxgZiEfe9AqG4H+Zv HIbA== 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=KZoSuQHQ27DM/d6b7OOglRkF4w/BysG+jSVaxzCus5g=; fh=+wFwOUChBMDyUEg63FIGralHY9qRggLvyZTCULGydUc=; b=mBFBxj8K2r5HYzBJ/PTIZxiSspdFu51Oxb6xocEgFUH/aktOtHbqPCFfUKMcE3ftpl 9bI+TFPA5YNdparVgbA9ZyiunMRfwOC4E2/3nqYAZdJeo0qdPrhumgBP9Ob2U3VHHTRQ FnLBUTdt4/4Z3ccQ6L1yb2vJVYJmNfIgaJWZivySVTRCfHt2r9/d1fAb7r9NglExMC88 ycQyX8DMbUZeZPL2c8wDAcFRa37vvqCYBgBm1V7MXGifgIi6qOgWPQJ2Y50oiZS12mQ9 mrC3suyk3kNq3zcN2q8Zk20maokXj5L9kcL3opshmC/pHSc/0Z5N7PDNSZdTLqwWyQOe +Aiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=HeDRz1ER; 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 x4-20020a17090a9dc400b0026343b62cdasi3427300pjv.154.2023.06.29.20.27.44; Thu, 29 Jun 2023 20:27:57 -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=HeDRz1ER; 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 S231724AbjF3DRs (ORCPT + 99 others); Thu, 29 Jun 2023 23:17:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231874AbjF3DRh (ORCPT ); Thu, 29 Jun 2023 23:17:37 -0400 Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DBBB3598 for ; Thu, 29 Jun 2023 20:17:33 -0700 (PDT) Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-560b7ac3cbfso956679eaf.2 for ; Thu, 29 Jun 2023 20:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1688095052; x=1690687052; 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=KZoSuQHQ27DM/d6b7OOglRkF4w/BysG+jSVaxzCus5g=; b=HeDRz1ERohiy6m7ihytJYCLaW66pr6T/yVt3YJJVg+ByWiKq4yaXI4f/SVp6flkL+e MUFr8LdBari+Ig036YI4Hq83c5hmfUGZoLtXb3P2kvkgdyi+f132IV8Ci/c9QnPKnrFC QTiFkcVn8WpLZV0/xbD4SyhXu+ltOEWK6gsGQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688095052; x=1690687052; 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=KZoSuQHQ27DM/d6b7OOglRkF4w/BysG+jSVaxzCus5g=; b=BASZvwv/8YCLj+vtJkCkLkHRG5NYCVwYBR0KYbdekVemYtwA2cQO8Xo/Zw1WycPZ7r 62NHx34lcoHvBCAlN+9mXsLW16ZbsxB4NviQ6GV/EFiaOUKbRXdYki4Vitou0zrTlX8I wCmCK4f6LnzDQcHub2LuGwDOZgD62yBp38OVE11HmvclfJGILfre8Rj70iJIMkclgNEm Y76UKsBm9lz1uqohPxSu9jk4/cyKsTtJRcrQx/CmDJ7+12LQ3GMnY3i13T86CrcF51Ss G1vKtRQEQWI1OsfiPsi3KOv0dKiHeCzqtzbEIhqEko9bX//dvIc5M4XOHt74tHcdS8em 68VQ== X-Gm-Message-State: AC+VfDzF3RUFBO+6H8JR1mmVfS/2uAq5TYPP3FXPFSFuWHICmAsiziHo r4JeK2vyYKLLPIypOIeTu9+pzg== X-Received: by 2002:a05:6808:d4e:b0:3a3:7e8d:b0b with SMTP id w14-20020a0568080d4e00b003a37e8d0b0bmr1648172oik.22.1688095052740; Thu, 29 Jun 2023 20:17:32 -0700 (PDT) Received: from localhost (183.43.230.35.bc.googleusercontent.com. [35.230.43.183]) by smtp.gmail.com with UTF8SMTPSA id y12-20020a655b4c000000b0055adf339c35sm6407088pgr.31.2023.06.29.20.17.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Jun 2023 20:17:32 -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 v1 2/2] selftests/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED Date: Fri, 30 Jun 2023 03:17:20 +0000 Message-ID: <20230630031721.623955-3-jeffxu@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <20230630031721.623955-1-jeffxu@google.com> References: <20230630031721.623955-1-jeffxu@google.com> 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?1770096612847325144?= X-GMAIL-MSGID: =?utf-8?q?1770096612847325144?= From: Jeff Xu Add selftest for sysctl vm.memfd_noexec is 2 (MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) memfd_create(.., MFD_EXEC) should fail in this case. Signed-off-by: Jeff Xu --- tools/testing/selftests/memfd/memfd_test.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/memfd/memfd_test.c b/tools/testing/selftests/memfd/memfd_test.c index dba0e8ba002f..dbdd9ec5e397 100644 --- a/tools/testing/selftests/memfd/memfd_test.c +++ b/tools/testing/selftests/memfd/memfd_test.c @@ -1147,6 +1147,11 @@ static void test_sysctl_child(void) sysctl_assert_write("2"); mfd_fail_new("kern_memfd_sysctl_2", MFD_CLOEXEC | MFD_ALLOW_SEALING); + mfd_fail_new("kern_memfd_sysctl_2_MFD_EXEC", + MFD_CLOEXEC | MFD_EXEC); + fd = mfd_assert_new("", 0, MFD_NOEXEC_SEAL); + close(fd); + sysctl_fail_write("0"); sysctl_fail_write("1"); }