From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9B73C43381 for ; Wed, 27 Mar 2019 19:03:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70E28206B7 for ; Wed, 27 Mar 2019 19:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553713418; bh=Ezq8V2Lo8P5a6dax5OsET3Uw0HGuTkr0Y3PliA8C/eY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VtiS7spCX/7SAD3RAaMhuV2CHarJpvpJQ87wFATfKm19zRVeRlQ73NfupxMTZleVF PgRcEtedapSCQ2qy1+7KHr4CVwKOyzsoDjGtCJq4X6ZMpCODGVZc+OjNKx9QgnmFKB Dbcj8XzNbyr+kByEi62lVNIYy92lhPLZBZKkuEh4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388509AbfC0SNY (ORCPT ); Wed, 27 Mar 2019 14:13:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:56004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389137AbfC0SNX (ORCPT ); Wed, 27 Mar 2019 14:13:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 730D52177E; Wed, 27 Mar 2019 18:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710402; bh=Ezq8V2Lo8P5a6dax5OsET3Uw0HGuTkr0Y3PliA8C/eY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YJJNjuQMVpkKnuCgCoo1pitMOLevLXdB6Qn+SkGu1vaoEEb83nFJM4OlSwsi/6rM+ AKODZpvPR4nV8+qWbqZfUU/Xx9uiYBTtjHU/OK5xF37X7h/LK9sVgbofsDep2kVtHf 0LU9C0A8ZEIoKIpwwhx1mOHJkaUW6RNLYd9DXM5g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tycho Andersen , Shuah Khan , Sasha Levin , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 103/192] selftests: skip seccomp get_metadata test if not real root Date: Wed, 27 Mar 2019 14:08:55 -0400 Message-Id: <20190327181025.13507-103-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327181025.13507-1-sashal@kernel.org> References: <20190327181025.13507-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Tycho Andersen [ Upstream commit 3aa415dd2128e478ea3225b59308766de0e94d6b ] The get_metadata() test requires real root, so let's skip it if we're not real root. Note that I used XFAIL here because that's what the test does later if CONFIG_CHEKCKPOINT_RESTORE happens to not be enabled. After looking at the code, there doesn't seem to be a nice way to skip tests defined as TEST(), since there's no return code (I tried exit(KSFT_SKIP), but that didn't work either...). So let's do it this way to be consistent, and easier to fix when someone comes along and fixes it. Signed-off-by: Tycho Andersen Acked-by: Kees Cook Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 83057fa9d391..14cad657bc6a 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -2920,6 +2920,12 @@ TEST(get_metadata) struct seccomp_metadata md; long ret; + /* Only real root can get metadata. */ + if (geteuid()) { + XFAIL(return, "get_metadata requires real root"); + return; + } + ASSERT_EQ(0, pipe(pipefd)); pid = fork(); -- 2.19.1