From nobody Tue Jan 25 14:47:25 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CDEE1198630A; Tue, 25 Jan 2022 14:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjqSs5DTnz50qj; Tue, 25 Jan 2022 14:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643122045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xMATo3fHAKYNyhwtDx43WKdO65OUQ7MAxU0hAmLdehc=; b=LRj3m08E/YKIxqqd3rm43YeNU6oqJffInTQPmuruqIi3ph2IHjZETJ5VY7NJFOyTngCeT8 PA6jyIwf0RBml4YjHPBm+HmeN1XfGubb35whAuhtZL6818BsFbQlKSJ97C+Rc25N+OelAZ xCwVkbhEuucrTDFC1yPFWmFbT6jM1ie3HpZzZcC9ZJm8XHjfTo1W6NBZn/BQtlZ1ok/1CN oRyeENt6zvRrApp67FLyX1WoFme4LD9iZs4PiXK5NUBH7OkdKfKJC/KJS3DRaKTMTMdxss 5VLkJ9teedIxQ5TQ0VDfnwQxlrTL+AIm2wdrz5u1o9sDcH8uwDt4Wk/qEVY95Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F91C38B7; Tue, 25 Jan 2022 14:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20PElPcf000249; Tue, 25 Jan 2022 14:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PElP6O000248; Tue, 25 Jan 2022 14:47:25 GMT (envelope-from git) Date: Tue, 25 Jan 2022 14:47:25 GMT Message-Id: <202201251447.20PElP6O000248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 9caeb82eab28 - main - Revert "linux: Provide dummy seccomp(2)" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9caeb82eab2805782b9c3d9205007c1b0795e808 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643122045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xMATo3fHAKYNyhwtDx43WKdO65OUQ7MAxU0hAmLdehc=; b=suBdi2UWHnj6MVWXnxHbC2T3AvhVmWawL69ZpFLEGov33ICpFigskEtIK5McRHIzDMMJmz Yef9U6KMYC8/fKM8oM+j71NKjjNpddTH7pPrUX/AZbuGjH5MJMgX1/NTv9zXOCZruUCtHJ 3UTskSVcoqVyMt7Aq0zIkcjE0OGTGIgOM4RKCLuzGd0urMQM+/DwLIHa0y38H0TI2k1QQ1 07kOOvqxRa/7ReWy07Yb03ecxOp6HGiiA6wNKV/fMrL7CCcijK5S4XI4k9/dmN79dhjpl0 C1SN8YgAbh9v+N5mzBZeSZdbxqgwlkuZN2Laa4o8ImPqN2aWKhNbkdTLt1sc+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643122045; a=rsa-sha256; cv=none; b=acQ6QKm40uCUtly6hlbQkKpAQGJWlbA5qFtnFVohqcTETsUfQk0vxRD7IZMOwMOZQPydkn IJqHv7NCm9m9KoGVDQeR9XZqBi2wG+Kovat3M+iAp3EVwp7LosZF8TpTxvjUAEMClndTcL lIP+3lPsWacqNLnzxuofo9Euc1IlXVFiXgPUx2eVFV3QKVNdHQxUUL80ACumYOWGY0G532 /dmHuK5zMkys64/zgruqAFE2kcTKS+j+r75gwRm5szuWZVUXRP2sCBt7G2R1J5wvyLcIu+ rtzyzTQsmqIhWx5lCGRCQ2w0yKN5U3X/MfJ17svHjgYe/wq9N/INunQPdsSm/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=9caeb82eab2805782b9c3d9205007c1b0795e808 commit 9caeb82eab2805782b9c3d9205007c1b0795e808 Author: Edward Tomasz Napierala AuthorDate: 2022-01-20 22:25:15 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-01-20 22:25:15 +0000 Revert "linux: Provide dummy seccomp(2)" This reverts commit 56981629f91fcdd358ccb41081ff6dcc2edac12f. Wrong patch; fails to build on i386. --- sys/compat/linux/linux_misc.c | 16 ---------------- sys/compat/linux/linux_misc.h | 3 --- 2 files changed, 19 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 3287c64ab515..a8857eda680d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2880,19 +2880,3 @@ linux_poll(struct thread *td, struct linux_poll_args *args) tsp, NULL, 0)); } #endif /* __i386__ || __amd64__ */ - -int -linux_seccomp(struct thread *td, struct linux_seccomp_args *args) -{ - - switch (args->op) { - case LINUX_SECCOMP_GET_ACTION_AVAIL: - return (EOPNOTSUPP); - default: - /* - * Ignore unknown operations, just like Linux kernel built - * without CONFIG_SECCOMP. - */ - return (EINVAL); - } -} diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index 9a7cf89466a2..3bfc9843cda2 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -153,9 +153,6 @@ extern int stclohz; /* Linux syslog flags */ #define LINUX_SYSLOG_ACTION_READ_ALL 3 -/* Linux seccomp flags */ -#define LINUX_SECCOMP_GET_ACTION_AVAIL 2 - #if defined(__aarch64__) || (defined(__amd64__) && !defined(COMPAT_LINUX32)) int linux_ptrace_status(struct thread *td, int pid, int status); #endif