From nobody Tue Jan 25 12:25:37 2022 X-Original-To: dev-commits-src-main@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 6CB80197449A; Tue, 25 Jan 2022 12:25:37 +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 4JjmKF2gWCz3Jcn; Tue, 25 Jan 2022 12:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643113537; 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=IK716ff8Wsoo/qzWtrfXLvUnNWvysxQtSE1mfnu/Yo8=; b=aF3I160+5x0NBGFQVbRqmY7tjKRZGN7mz5OwrE5Gv1GN2iMbn/6bzIa3y9J2DQnnXVqJEW W858lZE3qlkF+nSiA2/m36upHe68T0PVBO9nNpPjCXR7RdPtwjdBLjYb8jQPzOUHRKzg9V zFguLpyLLdxkgJX5TVRpLKDBF3eEGDu80qKkgp3aY6Rt81ia6+YkwwPQ6yucZwQ+w10GiP ashjsTw2yX/ont4CtS7panYyoMeWz4R8Bam2rANBhicK6EDF//oaIt+r+pHZdjEswcJorV XWt/v/Gf4eecU5qaW6EQ2fsIKfvWuNIramzcHaniQohQWUUTWKfo6/iukmiodg== 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 37D05156A; Tue, 25 Jan 2022 12:25:37 +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 20PCPbql012899; Tue, 25 Jan 2022 12:25:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PCPbc5012898; Tue, 25 Jan 2022 12:25:37 GMT (envelope-from git) Date: Tue, 25 Jan 2022 12:25:37 GMT Message-Id: <202201251225.20PCPbc5012898@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: 56981629f91f - main - linux: Provide dummy seccomp(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 56981629f91fcdd358ccb41081ff6dcc2edac12f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643113537; 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=IK716ff8Wsoo/qzWtrfXLvUnNWvysxQtSE1mfnu/Yo8=; b=LANfTh5B4u7tYNAZzYAr97/wvgGw20lfNN0L7f1V5Nze2IzfOLIcOdZAqFFzH4+lugof5l mJ/cNPVOvf6F7cM2LF/QVMj73t/43j3wAH+f7SfTcUJx/56HuyW/ax0Nf4vH2v5CS0jcXO 7gSW5vLOrFyg924FFF5mnKe+ahIjjPmIOfbKXoREn5r0IcrP4Caw3AqWaDXhPhdTLehhBk scKMpCApkc0kJaXLokbB3rg+7jnG8YVQI6NhMfSE8Lp6s8qy53iXB3pof/S2a7rZuS2yWs cDT2iUnjz23oAw6P46DFkVMr1agv34TP8KOTjFRscLWIG7IG0RTCNdet/tC0/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643113537; a=rsa-sha256; cv=none; b=UtUpiznJzQNckBwL1Sgg6T4tvjbL1tveBEU+j0GIBQ0/3J1TzUwuHiNKJVNSRhNeZ/QK89 8kj2fCjQ6P9s4WLMEXboA3T6i7asbq3O6mKzHu+XLs5PWX0c4lXz1UANE08WZlhWe044Df nmNlSrM67A7ktPyNHQJFFj4yHj+1riG8BJlmF2vSlA5qvVglLEbiKEumI/853LPm1/Rhv2 53zDKcVCfrG38xTVQCVu2iVCjdyaTy82lR5DoF6n8cKkFSwS4VJ2Y2R5FOdSLYWiy+8RmN wXjOqXPi5b9qgyLwQ7zGAlxtcXlErWDtBPx/GxWYJtdwbXqs1t7+VLSFJqNLpg== 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=56981629f91fcdd358ccb41081ff6dcc2edac12f commit 56981629f91fcdd358ccb41081ff6dcc2edac12f Author: Edward Tomasz Napierala AuthorDate: 2022-01-25 11:53:56 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-01-25 11:54:00 +0000 linux: Provide dummy seccomp(2) Don't emit warnings; 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_misc.c | 16 ++++++++++++++++ sys/compat/linux/linux_misc.h | 3 +++ 2 files changed, 19 insertions(+) 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