From patchwork Thu Aug 22 13:34:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1151602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46DlrY0VX7z9sP8; Thu, 22 Aug 2019 23:34:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1i0nEn-00069F-KD; Thu, 22 Aug 2019 13:34:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1i0nEk-00068i-KJ for kernel-team@lists.ubuntu.com; Thu, 22 Aug 2019 13:34:46 +0000 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1i0nEk-0008Vv-8Q for kernel-team@lists.ubuntu.com; Thu, 22 Aug 2019 13:34:46 +0000 Received: by mail-wr1-f72.google.com with SMTP id v15so3225891wrg.13 for ; Thu, 22 Aug 2019 06:34:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=k/LH1sdj7o1jfOad9ZKaVsJLB3JNjxb2sWF9AYfDO0Q=; b=qhSRo8Egj50iPwngyjOAhtDbhnK3Od5/nMbp81ajuWxu/J4jDFTRAshV25m4Z0Yx8F yHEddZJlCXIOiv4L6orkv6wiI+PibjJGCYlmOYhniRMhXE1hHnPP2dphuJwtB9fQ6T6+ FUnOXcejk6DxJSxuII/6w3Jl/YDiCUKsUSYRz1PRDxDNiyfVp4qjxNvrjgXlridM5uXV uwb5tTfSDJR1mhBQ+WQyYlp8r+QZWjWu98C2nFCY6zIRW81knAOpZgWbhyr1vrL2TTbG FsnrVOSXTE5TFW1QMo05/vYS9Qj2CI+AdPw0rNPFsMtVuW0NGozRIBO+1AL5ZXezucgc QcYw== X-Gm-Message-State: APjAAAWjlxSakwFEyldTZ5ae4Yy2vKIOtOYcbjdgQrb0np1Yi5h1Xy09 HbEgvZVQuiMaBVILxhm+PMNSG6c3hCMbKydwu+2yzYeuqca7TC9cOqKnospMP/isHnl8Y/J53+4 0BmnGocWySJGmgD155xNFj9Xm6kLBEKOMGWhqEbeSeA== X-Received: by 2002:adf:94e5:: with SMTP id 92mr24620598wrr.212.1566480885787; Thu, 22 Aug 2019 06:34:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3rsni2S5VnUeMkjOZ+JihfGt1k8izQD5H625pbIOndizyN4Vw5S6NL3SC9nlr5uOCre8vRA== X-Received: by 2002:adf:94e5:: with SMTP id 92mr24620575wrr.212.1566480885537; Thu, 22 Aug 2019 06:34:45 -0700 (PDT) Received: from localhost (ip5f5aee3f.dynamic.kabel-deutschland.de. [95.90.238.63]) by smtp.gmail.com with ESMTPSA id f17sm3050849wmf.27.2019.08.22.06.34.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Aug 2019 06:34:45 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/1] Revert "selftests: skip seccomp get_metadata test if not real root" Date: Thu, 22 Aug 2019 15:34:42 +0200 Message-Id: <20190822133442.7283-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190822133442.7283-1-kleber.souza@canonical.com> References: <20190822133442.7283-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1840932 This reverts commit c33a23ff8ffcb8800bd2628f2af308a43496590f. Commit upstream 3aa415dd2128 (selftests: skip seccomp get_metadata test if not real root) depends on d057dc4e35e1 (seccomp: add a selftest for get_metadata), but the latter has been reverted on bionic as part of LP #1837664. The get_metadata testcase doesn't exist anymore, the backport of the patch ended up changing syscall_restart instead. Revert c33a23ff8ffc, which is not needed and is causing trouble. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Thadeu Lima de Souza Cascardo Acked-by: Stefan Bader --- tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 2a87ccf6ceae..ba15baa2061b 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -2680,12 +2680,6 @@ TEST(syscall_restart) struct utsname utsbuf; #endif - /* Only real root can get metadata. */ - if (geteuid()) { - XFAIL(return, "get_metadata requires real root"); - return; - } - ASSERT_EQ(0, pipe(pipefd)); child_pid = fork();