From nobody Fri Jan 28 11:45:52 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 9D978197E689; Fri, 28 Jan 2022 11:45:52 +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 4JlbJ03cFJz3CcK; Fri, 28 Jan 2022 11:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643370352; 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=T9dhSdrU3onreszmvc0kS4jiYAo8yhYDj57bqRqvO54=; b=inhf3es8gRTA+sWOS/zBCPZfmQPNu3gYvZJxaBLtkQEYURHDAdWJiUsZuJOVUeu20BCiKX k6k6H6admsUa1fJQrVc8sRD9gttCdrTCEyHEyV8HINK+Ko6mdTeBxEV/LCbqYv+830L2zs MNJP0mx/yNqL3r92ysyb7HYWnaH1dvCWLMLbZ+mpA+Ea3xNjxuUUjSUcf6scuQnm959ZSy yXS1Zcib4Rv0JdHL39p4pMd0gDlMI66U81gW0F3zcONzAtnEoP2GWNeSW2F8ENA6l3Cg4q n9Z8s0wLVRYdPH2pua+oGaKqtj6b6nLANzKiU3K5tISt/AfQAJYcMIBlmK5ZRw== 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 5CED3298CF; Fri, 28 Jan 2022 11:45:52 +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 20SBjqg2052922; Fri, 28 Jan 2022 11:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SBjqWo052921; Fri, 28 Jan 2022 11:45:52 GMT (envelope-from git) Date: Fri, 28 Jan 2022 11:45:52 GMT Message-Id: <202201281145.20SBjqWo052921@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: 99454d3e98ff - main - 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: 99454d3e98ff205881aa7abef39234c9afc7600c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643370352; 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=T9dhSdrU3onreszmvc0kS4jiYAo8yhYDj57bqRqvO54=; b=pKIxkvlaNuVOByb/pwRSOV9rB8ym1UUH4xMWCa9T6G1d9LoNj/Y7zHigHlz7OMEC4+fzml vEpTk8v+OGt9thqf5EekV4AT7Niy/IpXXcT9h+EFa/mf4cUTSd4e+DamkBog3/5761+8P/ iLByyi0sB36FrZsKLMO9xZmfKNEBo2IqADmQT1I5MN5FDxVvVERcqPfoMIwaPVETP3GIfe bePGdAmWx2Lph34yYCBYVhNpXFxW1z0RUCmBsPRRSKGecECz5r4MYyoaRFdZUvdGBuOxVd +8Cc8G5PhLXur5xx8wWhjei/yQvk/tbG5ugbetszypXu+kufAibit+FHiHfBWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643370352; a=rsa-sha256; cv=none; b=q63ozKYAURky1CUHAaerdbe1ETPVH/LCHZWTFzR8z7qbXebwob/y7s51of2Yz4YRZ/HCnY KPzhf3RpSntEO3EXdMsUbJCmH3jkaAlK6zBxSMew8+YBFHI+AVin3tJ8i2B2PWsIbwWYkg fyPHCR+iH9DLUBISoO85KObpQTXBMSNmw0EtSE3YtjqJlDqqfTbVZj6tCqrg3OkKHT2V5z FxbaJWKNuMjaO48N5c93ijMvvmBLDxDUAzXtM8EDNNrR8tE1W9JovN0SbJVzfy8hVSw7bX 356P6PZ0V3YFhyUHOygr1EFindO3l7qRshtPTqGJwgw6SdvOPeaAuPBAA0Ya7Q== 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=99454d3e98ff205881aa7abef39234c9afc7600c commit 99454d3e98ff205881aa7abef39234c9afc7600c Author: Edward Tomasz Napierala AuthorDate: 2022-01-28 10:55:11 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-01-28 11:45:41 +0000 linux: Provide dummy seccomp(2) Don't emit messages; this isn't any different from a Linux kernel built without OPTIONS_SECCOMP, so the userspace already needs to know how to deal with it. This is also similar with how we handle seccomp in linux_prctl(). Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D33808 --- sys/compat/linux/linux_dummy.c | 2 -- sys/compat/linux/linux_misc.c | 16 ++++++++++++++++ sys/compat/linux/linux_misc.h | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index 91a56616fc10..e254bf94c026 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -112,8 +112,6 @@ DUMMY(kcmp); DUMMY(finit_module); DUMMY(sched_setattr); DUMMY(sched_getattr); -/* Linux 3.17: */ -DUMMY(seccomp); /* Linux 3.18: */ DUMMY(bpf); /* Linux 3.19: */ diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index a8857eda680d..3287c64ab515 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2880,3 +2880,19 @@ 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 3bfc9843cda2..9a7cf89466a2 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -153,6 +153,9 @@ 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