From patchwork Thu Feb 2 03:04:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 51646 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp12490wrn; Wed, 1 Feb 2023 19:28:01 -0800 (PST) X-Google-Smtp-Source: AK7set9FbTa7qL6WtapSQKSQMOskN64hrAEi6cHl4BVWw8LBLVmkkMpb7ot16aKbHRZdmjug7ow0 X-Received: by 2002:a05:6a00:1746:b0:593:b491:409f with SMTP id j6-20020a056a00174600b00593b491409fmr5805342pfc.6.1675308481477; Wed, 01 Feb 2023 19:28:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675308481; cv=none; d=google.com; s=arc-20160816; b=z5eDfcRjjBeF1hfaWRJMQQaHofVbwsi3EotuazYe+NmtQEHTx34tdIs/5ZR4komQz3 Mswo/65vHpvAoSyEL626gv9szgU6RwqfY1C5NkZ8FWNNVgcQlrZ3u76rvdg9YvwH+X0o J94JwtuHEfZQZjVh77VAEVoAnx+PvPkgX8VXdbKb32acxYEhUG7hyDwwMEOVmqPDvHyZ BPNsVdJ5IypyBMdpyDOju7RZfviND4Q06USFhEdDYgJrsCUDCGGww/bW+U/rlHSMxnwA Y/7mnVFfZosizDIwj02i5e1GvAGm666QLJEmHmtvmD4PP+Y5aavuTh6VC1ye+3hJwjKs eVAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=eiBfk+BfeZMyiGmDtQ57nkoCct1hYoOMf69qzZGcvyo=; b=eh8oy9OmzyLFMF7guww6oUmfHPd59Cs1I1LC8fTwGUdSPdvU8DNOoKDZnHcQTc1Wek G+Zha+HpO0AdhCn5SPzkRZXPFlbrTnqgOapEzD6S5ukiLTE0nsd7WSFwmlezmVCOW9py yS8FPlnuUhtVEKYgBZJGbfnl32/2zRio9pTa0X4Qa49ObfYCMfGZfnX+6L0pSYFmYRU4 r2kte6qhOXdgEtsjy2G6zSJFMrv+rfcb7HYLz6ROZGGesYgns23QEtgdTM7X9zfQEduz haQ4hQhVFaeUCFn8Os3Gl2G9U+B1rmhIJPYxErqF6PTkZtWXofybNJ2yUwCjBY80XJGB JtJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=iCBw856I; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cj5-20020a056a00298500b0059258b3c5cbsi9360624pfb.358.2023.02.01.19.27.48; Wed, 01 Feb 2023 19:28:01 -0800 (PST) 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=@google.com header.s=20210112 header.b=iCBw856I; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229851AbjBBDFK (ORCPT + 99 others); Wed, 1 Feb 2023 22:05:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231733AbjBBDEs (ORCPT ); Wed, 1 Feb 2023 22:04:48 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7879C38659 for ; Wed, 1 Feb 2023 19:04:46 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a4-20020a5b0004000000b006fdc6aaec4fso472130ybp.20 for ; Wed, 01 Feb 2023 19:04:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eiBfk+BfeZMyiGmDtQ57nkoCct1hYoOMf69qzZGcvyo=; b=iCBw856I6Vh3uVjkTHXCwcpAedCJ/h5ZCWWLNJT+8sqP5ggv3TqZKfn/l3Ws4tNtBl eeg8aEBPq8gnFwOLML6sLsoVxT5NCFSJaGQJywPx2+wZnF7eT+Dodghc/YuhOVY2FiHF sfGnZ7h0enxgTNWAozbRL/bTJum5r4dsXCP6my1494BMC1WwYMkNIH55BRjbKeYmJEbq C8tejG+ZsgAPV61sAUq5BGzh7iVkqZq/GuKjGvx7wzFTLQJhjlIUjCuOnRmIpCb1nl4b g/Mp5SqlAESICg+QpmsyyWyyGfUrAxWcQ3LCW5U0uFce39qp8bu9ioATngi1gkUyDmz+ Rbeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eiBfk+BfeZMyiGmDtQ57nkoCct1hYoOMf69qzZGcvyo=; b=Wp32NEQuYB9ATLguUJVeIIW0Getzh/UUxYlHWijQfYcuo9Wug4fCLtrxFXkbRA/ANT 0AFOi7tfatwD5xZGnd+YoTFIUNJw51qtW1f69V77VKs2WRfmJgf6/txIE03MN6oXJuwo LD/5NlofV+eNZiBbTNTCpnK2Fd69AKZmohT5NK0WLM5OpwMoApWq0y5TboPWuoQhKweT tAUA0JGHX7KqT3BLG6igOU+Jw8hKZ56yDGmIOJJU7vBAbbR1JDYHukvofRlXs/NnIWf+ 7blh+sFysM4QC1UCzHrjti+Lko11mgYf7XlwUAqf8S76sD1dKEXk1vJGwQubGBg6Lzat TNeA== X-Gm-Message-State: AO0yUKXkJshdBn3BoP+XP1+karQNWrp+OLyGQ+4b/leY6G5X8h2vTWYt GyIU85TCIZXS4d/uQHNDIpXEdcev/+Q= X-Received: from avagin.kir.corp.google.com ([2620:0:1008:11:eee0:dc42:a911:8b59]) (user=avagin job=sendgmr) by 2002:a0d:d497:0:b0:51d:3714:b2eb with SMTP id w145-20020a0dd497000000b0051d3714b2ebmr491482ywd.431.1675307086103; Wed, 01 Feb 2023 19:04:46 -0800 (PST) Date: Wed, 1 Feb 2023 19:04:28 -0800 In-Reply-To: <20230202030429.3304875-1-avagin@google.com> Mime-Version: 1.0 References: <20230202030429.3304875-1-avagin@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230202030429.3304875-6-avagin@google.com> Subject: [PATCH 5/6] selftest/seccomp: add a new test for the sync mode of seccomp_user_notify From: Andrei Vagin To: Kees Cook , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Christian Brauner , Chen Yu , avagin@gmail.com, Andrei Vagin , Andy Lutomirski , Dietmar Eggemann , Ingo Molnar , Juri Lelli , Peter Oskolkov , Tycho Andersen , Will Drewry , Vincent Guittot X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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?1756688266081864750?= X-GMAIL-MSGID: =?utf-8?q?1756688266081864750?= Test output: # RUN global.user_notification_sync ... # OK global.user_notification_sync ok 51 global.user_notification_sync Signed-off-by: Andrei Vagin --- tools/testing/selftests/seccomp/seccomp_bpf.c | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 9c2f448bb3a9..05b8de6d1fcb 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -4243,6 +4243,61 @@ TEST(user_notification_addfd_rlimit) close(memfd); } +#ifndef SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP +#define SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP (1UL << 0) +#define SECCOMP_IOCTL_NOTIF_SET_FLAGS SECCOMP_IOW(4, __u64) +#endif + +TEST(user_notification_sync) +{ + struct seccomp_notif req = {}; + struct seccomp_notif_resp resp = {}; + int status, listener; + pid_t pid; + long ret; + + ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); + ASSERT_EQ(0, ret) { + TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!"); + } + + listener = user_notif_syscall(__NR_getppid, + SECCOMP_FILTER_FLAG_NEW_LISTENER); + ASSERT_GE(listener, 0); + + /* Try to set invalid flags. */ + EXPECT_SYSCALL_RETURN(-EINVAL, + ioctl(listener, SECCOMP_IOCTL_NOTIF_SET_FLAGS, 0xffffffff, 0)); + + ASSERT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_SET_FLAGS, + SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP, 0), 0); + + pid = fork(); + ASSERT_GE(pid, 0); + if (pid == 0) { + ret = syscall(__NR_getppid); + ASSERT_EQ(ret, USER_NOTIF_MAGIC) { + _exit(1); + } + _exit(0); + } + + req.pid = 0; + ASSERT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_RECV, &req), 0); + + ASSERT_EQ(req.data.nr, __NR_getppid); + + resp.id = req.id; + resp.error = 0; + resp.val = USER_NOTIF_MAGIC; + resp.flags = 0; + ASSERT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_SEND, &resp), 0); + + ASSERT_EQ(waitpid(pid, &status, 0), pid); + ASSERT_EQ(status, 0); +} + + /* Make sure PTRACE_O_SUSPEND_SECCOMP requires CAP_SYS_ADMIN. */ FIXTURE(O_SUSPEND_SECCOMP) { pid_t pid;