From patchwork Wed Aug 9 17:04:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 13391 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2981510vqr; Wed, 9 Aug 2023 11:05:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbK8reGQd4xWTl87x9ujShuiCnix82INdql+oYD5pLnOQS05VeRfhHx7J0S0lPHu8pd5Pu X-Received: by 2002:a05:6512:34c8:b0:4fa:a0c3:ef9d with SMTP id w8-20020a05651234c800b004faa0c3ef9dmr2331665lfr.18.1691604301947; Wed, 09 Aug 2023 11:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691604301; cv=none; d=google.com; s=arc-20160816; b=KOlu4KzvqjwhXyoYXpnkj8ox7vF25/Doe+uMU+6lAv7rrEAmpQX+Ngm5k/R7F2Zw5j yrpDHFyhq7VTaRhx2y+qCQeMZFC56bFSN1c+bKQJihawXKjOt4QDvBIf6zzyguKbnGbk NX9CavbShiM93/ppc7ly2qD84IE+zsGZ7JzAnKMICMJfS5BMMxzmzCAiQE2liybWSr0L SxPEa1Y4s+MvsS2j9Cw0YaUDh0sn/5Anv7RlMiya7AD5jHBrkJjYtSt5SCsvjaSBDa41 wVD9Byt8E0j5u776EjFGwPNnY6zPVmpr6OaUIsdHpBBPrd7tqH+f9hZJ1K1RlJJ1SRtV nK6g== 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; bh=0YPvaETPoByt7Uc/obFHqkQjGwAL0HgKesw9EzBopIc=; fh=nE/UqZX6qzpWLzz9CgtzS7bs+n+xzJ8NCqsu+2HYlgM=; b=GEJiO5Twg+Tq7ZFHwaCuEaXlqBsroS/QWvmkoX5hMPlIR5g+E/Etkk2i609hsFVXbx sTv6+++CqK5bZG8Stv8cumz+C/pWArOUGIBp/qU+dkApjFt2hYZBfrKl6LLLy1NH/ehI vh3ub/XyBrBhWHSnsvWtz7asjiB+yN2k8u2IblL9dXWsAr+e1BufP8Nd3mjYm+fSWnql ui3a0pk+yjBRfcgFJyqIiABcI8OAr+eWMfqPa+CxBmCNSXlunnT2Ztmuuy8S1HIt2lx3 q72WFxhK0oESwi6jnnylwuYs3j0EihM5s2oNig87tlUpYgxh/t4JfDcjaWBTNqLx5s0R zTuw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v14-20020a1709067d8e00b00992ca9eab82si7779943ejo.393.2023.08.09.11.04.37; Wed, 09 Aug 2023 11:05:01 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232609AbjHIREp (ORCPT + 99 others); Wed, 9 Aug 2023 13:04:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232245AbjHIREm (ORCPT ); Wed, 9 Aug 2023 13:04:42 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 16C671FD4; Wed, 9 Aug 2023 10:04:42 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 26F81D75; Wed, 9 Aug 2023 10:05:24 -0700 (PDT) Received: from donnerap.arm.com (donnerap.manchester.arm.com [10.32.100.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EB76C3F59C; Wed, 9 Aug 2023 10:04:40 -0700 (PDT) From: Andre Przywara To: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= , Shuah Khan Cc: linux-security-module@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 0/2] selftests: landlock: fix runs on older systems Date: Wed, 9 Aug 2023 18:04:33 +0100 Message-Id: <20230809170435.1312162-1-andre.przywara@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE 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: INBOX X-GMAIL-THRID: 1773775672422112732 X-GMAIL-MSGID: 1773775672422112732 When naively running all kselftests on some systems, it was observed that the landlock selftest is quite picky and reports failures, even though the system is fine. Those two patches relax some tests to make them pass on older kernels: - The landlock ABI version is only "3" in recent kernels, so patch 1/2 relaxes the test to accept other numbers. - Older kernels or some defconfig based kernels might not implement the landlock syscall at all. Patch 2/2 catches this. I couldn't find an easy way to not check for the syscall availability in *every* test in base_test.c, short of not using TEST_HARNESS_MAIN at all. If someone has a better idea, I am all ears, especially as this approach will get quite annoying in fs_base.c. Cheers, Andre Andre Przywara (2): selftests: landlock: allow other ABI versions selftests: landlock: skip all tests without landlock syscall tools/testing/selftests/landlock/base_test.c | 29 +++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)