From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.41 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793826552; b=bhgTC5jOb+qMM6n6NgU+HQQ4XhNNU6b7KQEH303sta0c5M+wAe7YrJdphPNSOrM0Ei6T bN9tpquxQOji+NPyqcETDCP24eSKPGCtrqaE0PqjPniNwSpIu4fCilTCplQmFGS/86JJZ i7510dBPI7RNHXQu7YK1M6xYSFMzJCb0I8fhEoE7uAEIGaV6Y7VxCb30vTMVEOOwQ1pOR yfGkIctKQARo/UvXgMVHcSACRLsDCsvrstcCpthg/luubTcdn0Rx4bCip0VapUnEoXGId mJayRAJxIO1ZpFD9LkhPioz2iV/05K3OOWzn9YPjkbW22vJ641nXrynbO1uAkiKDq2A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793826552; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:Date:Subject: MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id: References:In-Reply-To:To:Cc:X-Mailer; bh=b1Up/mMzU2bQ97X/Wz1u2XktmxWFj0hsGQ/HEaQOHnM=; b=d+IduK4aUE7uUWqDQUUQrkzyKsNbyIt6bAkqFNUUF5yyBOlT6xKjoeFKgAzNBKDiniK+ iG60idrhc3sQKlaEjayoBmEmztIr7IkYNsd130sAW1mJdGrvaOQjh90A904NH8i9MAcco wJCwXjXjM/y1JSlpb3gbOyVy+mMIlpvMZzzYhPyeB7O1dioBufBZEhyh6t5CCubu0xX/J jWfSMr8s/br364kl6Mmbx85Nm69CuCFEKeryDS1QGwv6oBYURPi19r2xdT+HFNyq6Iq+g vA5um7haEHx9wWSSoXholmibr+jugHbnvB5dbTh2rZTT0VQj5W/j3STl7RwPf015Dzg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b="UGesA/Sj"; arc=none smtp.remote-ip=209.85.221.41 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4067260A263A for ; Wed, 4 Nov 2026 21:09:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4067260A263A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=UGesA/Sj Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-48b060ec084so765623f8f.0 for ; Wed, 04 Nov 2026 13:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793826551; x=1794431351; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=b1Up/mMzU2bQ97X/Wz1u2XktmxWFj0hsGQ/HEaQOHnM=; b=UGesA/SjsBHV1YCg+eVe/7SygDEICH4UvK00QL9E1FyrZnIUwnnKCC5tMUui9k16vR 5lBqhLtNhGFMto7U8ZVmB02PLNY9h9xqYYwJE2rUcy4QJmsBwt7k4CRJ4GXoiZrXZnvd iBMV6fehEYxjQMLCYoZM6BysJRaiBb2qLUF3z25l+U5JTEO4f4/Ge2jjOUsNGpTptJ9i TS98mWg5pooEBey6PVgGjt+LHXElHbIJfTNTcAHjKjRQKPvB4xnB0dDNjXB5ri0KaaRe fuKJKrsdB36NbQ01dTwgH8Z+BSGg0clVVdKf8HECboHuinyUzoFa+z0H/I6QEZ2RiiVa YCOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793826551; x=1794431351; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=b1Up/mMzU2bQ97X/Wz1u2XktmxWFj0hsGQ/HEaQOHnM=; b=bMWr+8pqM4aJv6X+a+PV/LpsrcOQtowczvLGplsToBfln4dfqlIsUusVscrT+6Sjpj FFFJYdtxNc7WlWctNHPrHue/G/MdLv12mzEaMTGaRqI1m5kskQt8wgoAApVUaLiQRTxv bzrfGBIVajSwtIW8HTviAum82VMlmB4vtdzuJFOxv0yZJZ7UCcTvXIFbPP1jkzLaA7vX e2iumTW/76lozk6rzVHG5szqo7S2xR9+ofh8SW9KCUCscKKULMMTYZZP6p4HinqQwiFG uw/mSLhWGWGmwQhjTh7T9ZjIPW+mGD9rmoCM+Q1ynXrNW0lMLq3vZsZ2WOROiqw2SWKH u8aA== X-Gm-Message-State: APuU4Z/rEmSJXVB4VrB0pxmF9L6x51R+9IBTOSf5sQjPdCF/pfNLA4TH CqvPSOs2C2GQIzM56zFnooN7uroBYtnDajuUCEEgSknHESVmAOGYRZfu X-Gm-Gg: AYBFou0Gfe77pWYxLxh1jjnCP/YXgmUMgkVH6a4R5/F6HCbMVu9hcy4Al6pnUpVsA3V 9ad/IkAe0ci0SCk9qZOmEhUyEu2zg2rVqhY413HjC92f9KJu/gzn1S6W6+FWUQ/qA2qI8ZCKYAl s5Gv8yA043ha8l6iEcb6R4I7ps/bJIyWxc0pAlBQw7eUcXyNM7Iyb20jX5VAiwZc3Q02OLrZmZY Wdo6zLT4d/8AyZY/y13ji/hOpkW4O02xmjgHvFajuiDLqtLdcN2N5F4owY/j2fLvRwmCU1/6VgV 3FOsYtYzfTMhY6SMFjbHlBWfcq1MyuC63SJSkBMRCtepS8eeLR6ABNuhaYVudG2aDnU8UH2EJl0 YGY0n7euwYnM49ssRQ6ZCzocxKQ8kmIwW5aYnt2g/rxKYTNAajPGfb7qqJluXAuBsmx5FRV+IN0 aMYx9UClVzJ2PkIjfFMJ2NZang1Nh1xEeZrZ3O2VmwL8xqk1hyZ5oVGS474TS21PqgT+BjWv8/I gWHeZ9U0rP+8H6j+EW7ICcn0QeUd3FNl+9y3SuWjmZDqPfRfbEL+RGsLst9ciP3nyMYEToNK3PH sMBnT20vm2zVUdb/FszQcF9YfJrzQ07ux6oOqOY0tWU91Qfdfd6o6Q== X-Received: by 2002:a5d:5f41:0:b0:48e:68d5:818d with SMTP id ffacd0b85a97d-48e6e2eb83emr40887465f8f.16.1793826550673; Wed, 04 Nov 2026 13:09:10 -0800 (PST) Received: from localhost (ip87-106-108-193.pbiaas.com. [87.106.108.193]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48fece99a5dsm5719865f8f.21.2026.11.04.13.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2026 13:09:10 -0800 (PST) From: =?utf-8?q?G=C3=BCnther_Noack?= Date: Wed, 04 Nov 2026 22:08:56 +0100 Subject: [PATCH v2 10/27] selftests/landlock: Assert audit initialization in fixture setups X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20261104-selftests-refactor-v2-10-c52f23f7ce33@gmail.com> References: <20261104-selftests-refactor-v2-0-c52f23f7ce33@gmail.com> In-Reply-To: <20261104-selftests-refactor-v2-0-c52f23f7ce33@gmail.com> To: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= , =?utf-8?q?G=C3=BCnther_Noack?= , Shuah Khan Cc: linux-security-module@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?G=C3=BCnther_Noack?= X-Mailer: b4 0.15.2 The audit fixtures check the result of audit_init_with_exe_filter() and audit_init() with EXPECT_LE() and continue with a negative audit FD when the initialization fails, e.g. when auditd holds the audit socket. Every following audit check then fails with a less useful message. Use ASSERT_*() for the audit FD and for the audit_exec filter initialization, whose result is used by the following calls. Signed-off-by: Günther Noack --- tools/testing/selftests/landlock/audit_test.c | 8 ++++---- tools/testing/selftests/landlock/cap_test.c | 2 +- tools/testing/selftests/landlock/fs_test.c | 6 +++--- tools/testing/selftests/landlock/net_test.c | 2 +- tools/testing/selftests/landlock/ns_test.c | 4 ++-- tools/testing/selftests/landlock/ptrace_test.c | 2 +- tools/testing/selftests/landlock/scoped_abstract_unix_test.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/landlock/audit_test.c b/tools/testing/selftests/landlock/audit_test.c index 81cb31aa32ad..63b1b2a04eee 100644 --- a/tools/testing/selftests/landlock/audit_test.c +++ b/tools/testing/selftests/landlock/audit_test.c @@ -49,7 +49,7 @@ FIXTURE_SETUP(audit) disable_caps(_metadata); set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd) + ASSERT_LE(0, self->audit_fd) { const char *error_msg; @@ -652,7 +652,7 @@ FIXTURE_SETUP(audit_flags) disable_caps(_metadata); set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd) + ASSERT_LE(0, self->audit_fd) { const char *error_msg; @@ -841,7 +841,7 @@ FIXTURE_SETUP(audit_exec) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init(); - EXPECT_LE(0, self->audit_fd) + ASSERT_LE(0, self->audit_fd) { const char *error_msg; @@ -854,7 +854,7 @@ FIXTURE_SETUP(audit_exec) } /* Applies test filter for the bin_wait_pipe_sandbox program. */ - EXPECT_EQ(0, audit_init_filter_exe(&self->audit_filter, + ASSERT_EQ(0, audit_init_filter_exe(&self->audit_filter, bin_wait_pipe_sandbox)); EXPECT_EQ(0, audit_filter_exe(self->audit_fd, &self->audit_filter, AUDIT_ADD_RULE)); diff --git a/tools/testing/selftests/landlock/cap_test.c b/tools/testing/selftests/landlock/cap_test.c index 3d7fd02e21ed..7b3b724e4406 100644 --- a/tools/testing/selftests/landlock/cap_test.c +++ b/tools/testing/selftests/landlock/cap_test.c @@ -775,7 +775,7 @@ FIXTURE_SETUP(cap_audit) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); clear_cap(_metadata, CAP_AUDIT_CONTROL); } diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c index 7d399c097c93..7ff94755b029 100644 --- a/tools/testing/selftests/landlock/fs_test.c +++ b/tools/testing/selftests/landlock/fs_test.c @@ -7504,7 +7504,7 @@ FIXTURE_SETUP(audit_layout1) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); disable_caps(_metadata); } @@ -8028,7 +8028,7 @@ FIXTURE_SETUP(audit_quiet_layout1) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); clear_cap(_metadata, CAP_AUDIT_CONTROL); if (getenv("DEBUG_QUIET_TESTS")) @@ -9605,7 +9605,7 @@ FIXTURE_SETUP(audit_quiet_rename) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); clear_cap(_metadata, CAP_AUDIT_CONTROL); if (getenv("DEBUG_QUIET_TESTS")) diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c index 50b637354b51..c1b6e288c965 100644 --- a/tools/testing/selftests/landlock/net_test.c +++ b/tools/testing/selftests/landlock/net_test.c @@ -2957,7 +2957,7 @@ FIXTURE_SETUP(audit) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); disable_caps(_metadata); }; diff --git a/tools/testing/selftests/landlock/ns_test.c b/tools/testing/selftests/landlock/ns_test.c index f5d4b86edd30..6491b53742f1 100644 --- a/tools/testing/selftests/landlock/ns_test.c +++ b/tools/testing/selftests/landlock/ns_test.c @@ -1944,7 +1944,7 @@ FIXTURE_SETUP(ns_audit) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); clear_cap(_metadata, CAP_AUDIT_CONTROL); } @@ -2596,7 +2596,7 @@ FIXTURE_SETUP(ns_proc_open) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); clear_cap(_metadata, CAP_AUDIT_CONTROL); } diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c index e0e7f95e889b..10371c1830ad 100644 --- a/tools/testing/selftests/landlock/ptrace_test.c +++ b/tools/testing/selftests/landlock/ptrace_test.c @@ -323,7 +323,7 @@ FIXTURE_SETUP(audit) disable_caps(_metadata); set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); clear_cap(_metadata, CAP_AUDIT_CONTROL); } diff --git a/tools/testing/selftests/landlock/scoped_abstract_unix_test.c b/tools/testing/selftests/landlock/scoped_abstract_unix_test.c index e006dba61652..5e8224623780 100644 --- a/tools/testing/selftests/landlock/scoped_abstract_unix_test.c +++ b/tools/testing/selftests/landlock/scoped_abstract_unix_test.c @@ -288,7 +288,7 @@ FIXTURE_SETUP(scoped_audit) set_cap(_metadata, CAP_AUDIT_CONTROL); self->audit_fd = audit_init_with_exe_filter(&self->audit_filter); - EXPECT_LE(0, self->audit_fd); + ASSERT_LE(0, self->audit_fd); drop_caps(_metadata); } -- 2.56.0