From nobody Sat Jan 22 17:37:24 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 71EF9196CAF8; Sat, 22 Jan 2022 17:37: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 4Jh3NP20T6z3v0m; Sat, 22 Jan 2022 17:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642873045; 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=0NhUw/4FM6kJoe4LMe6JrfHWrOSB2DgIl/iEb9Z372s=; b=fxwfaPL/lclTBkpKY9emUukra7T/OF0goDblswEZ2w4ClYNu9aMuS65MeGlHNR/qEyp9q8 wAGwBTdcnK1NTuKF6oOfwOjyGAI9mQk6uWqigJAgRl4As8WPbmJJoQxhypydwlndRsgLm4 wPO1PR8MOzFDlppf5eOHPpCm0xaZegU1Wgiw66Rkk1zeFwPww+BI1N3qAasOdrrIFlYKW2 S2IyT3v6CTO2aGVlFd1U534Mrpi7zglo1qXuu7swoXVGEng/pqiarTWnngtKmYSYb+OS7W ka7D22qbA/jWwnBQNFdhacrAIiPppuUb1osGZPIJGBPX7+QuTopb8RbjwQyrEg== 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 17EBC1342B; Sat, 22 Jan 2022 17:37: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 20MHbOSw040149; Sat, 22 Jan 2022 17:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20MHbOs8040148; Sat, 22 Jan 2022 17:37:24 GMT (envelope-from git) Date: Sat, 22 Jan 2022 17:37:24 GMT Message-Id: <202201221737.20MHbOs8040148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fe6db7270819 - main - Add security.bsd.allow_ptrace sysctl 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe6db727081936c43250f97a4ff4b9de20eb0091 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642873045; 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=0NhUw/4FM6kJoe4LMe6JrfHWrOSB2DgIl/iEb9Z372s=; b=TpIn6YfpFueFO3t7uunOlCUqHzDTV0EdnMjNRCJ7eboQFUQaAJD2+NhGRIldrRAHKdj9dE RQvrcBJoVbz0ECi9W2uyz8tYVxdS0AM8Iq6AzsHv810HmdUAjFSsYUY1BmU15pkHC+2oi5 3nZZVuefdQmp5OjCbQtE5C0tEUQRzRrV7EjX54965nWqCHA8MSZ7Zy6D8Z8nyxRczNXVNt tnO9lb+VS22q7/5dfem9Z0pgu1JReb55ZpJ1wAbrH9OwY79yk3lxPUBb5b82U4NpTUTHjg 70SGBj4HhBV9CO777SS3fgtrhfRHAK6VkzReo1gp5yVh0Lrotm2HlxYjnOJ7VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642873045; a=rsa-sha256; cv=none; b=ZNqWFR58PzN+sH4s0/LH8Ry9yZFor/ADcIQ5je1wXd6qTl89RH1FwqeICkAydM9OWSzTNU GtFh2sP3PCZsd7NfuFn88wGZul/+cb659E/HsY1Z7rr45w+8N0F54JKVo3qOtzexZg4D7u UyBOAnx5Y19VTL1JWQmzmm/OWAKeTvXNH55hNRzt+GBc/KNivM3fTRmVuPjyRrWAm0wdER d5aIyaL4eGRsjpq86SgBOdOXYgGakbTbrCBPwftUX2xmQgSNw0+AE/6kSdPy9hBsPj+OsH dI7QkpVlFaj35m6yT/6OMVe6kjQiyre84S89yskWCBNcQz9hlxs98wFAf0Ieug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6db727081936c43250f97a4ff4b9de20eb0091 commit fe6db727081936c43250f97a4ff4b9de20eb0091 Author: Konstantin Belousov AuthorDate: 2022-01-21 21:52:35 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-22 17:36:56 +0000 Add security.bsd.allow_ptrace sysctl that disables any access to ptrace(2) for all processes. Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33986 --- sys/compat/freebsd32/freebsd32_misc.c | 6 +++++- sys/compat/linux/linux_ptrace.c | 3 +++ sys/kern/kern_prot.c | 6 ++++++ sys/kern/sys_process.c | 6 +++++- sys/sys/ptrace.h | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 60f46ad2cfba..28262f011830 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -977,7 +977,11 @@ freebsd32_ptrace(struct thread *td, struct freebsd32_ptrace_args *uap) struct ptrace_sc_ret32 psr; } r32; void *addr; - int data, error = 0, i; + int data, error, i; + + if (!allow_ptrace) + return (ENOSYS); + error = 0; AUDIT_ARG_PID(uap->pid); AUDIT_ARG_CMD(uap->req); diff --git a/sys/compat/linux/linux_ptrace.c b/sys/compat/linux/linux_ptrace.c index 590a3474a006..151355d2bb3f 100644 --- a/sys/compat/linux/linux_ptrace.c +++ b/sys/compat/linux/linux_ptrace.c @@ -511,6 +511,9 @@ linux_ptrace(struct thread *td, struct linux_ptrace_args *uap) pid_t pid; int error, sig; + if (!allow_ptrace) + return (ENOSYS); + pid = (pid_t)uap->pid; addr = (void *)uap->addr; diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 0031465f081d..808dd04ba1d3 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2485,3 +2486,8 @@ change_svgid(struct ucred *newcred, gid_t svgid) newcred->cr_svgid = svgid; } + +bool allow_ptrace = true; +SYSCTL_BOOL(_security_bsd, OID_AUTO, allow_ptrace, CTLFLAG_RWTUN, + &allow_ptrace, 0, + "Deny ptrace(2) use by returning ENOSYS"); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 2c212edd0ae7..0b3a34550506 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -479,7 +479,11 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) int ptevents; } r; void *addr; - int error = 0; + int error; + + if (!allow_ptrace) + return (ENOSYS); + error = 0; AUDIT_ARG_PID(uap->pid); AUDIT_ARG_CMD(uap->req); diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 1e7c1c71056b..4cd7a3fceaec 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -243,6 +243,8 @@ int proc_write_dbregs32(struct thread *_td, struct dbreg32 *_dbreg32); void ptrace_unsuspend(struct proc *p); +extern bool allow_ptrace; + #else /* !_KERNEL */ #include