From nobody Sat Sep 05 00:35:17 2026 X-Original-To: dev-commits-src-branches@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 4hcDrP4cyCz6qZS0 for ; Sat, 05 Sep 2026 00:35:17 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hcDrP1tRFz43sF for ; Sat, 05 Sep 2026 00:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788568517; 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=f8vNeaJix4Ko5x+Q2GxwL40z5E0Zr6ZMwpIHFOXO3IU=; b=s3JOecFSXeu3dqRI4+PKHgsnVw/AJ8B9CXgAQ9iX3DPde8BMZd/HpiFaNo1b4W43/gNPjL kvN5N0FKPrApI/leZ/1qzcfe5ILUTyFpFQNjDW0BzaMHPWdOUnLaGyYY6b4c71LdaX/S8b JdeBvc53N786CPDK2dbLAtKdyMvocvl1QYxb6emqbreKB2lXp3MYNbgWbm1ZhEfnyifHVg GD9OfNSY4LFgfNYviypLxenCbnEb6tVFbj85Q7nHfnZwVFSJQQBg+CtNUNzhFZQdbsa4tz aClc6g/AdCkNeo6hLIzN1ghAjL/XWY81bnTNCPcDjs7OQHG4COMjrQ5cSXf7ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788568517; a=rsa-sha256; cv=none; b=KC3E5wo1J1sbW64NB/V2QFA1Zb0eSVgToeuXSLOHOFAFOqwmoHhkWix6zY5hZrfOxE0PC6 gE9heYJl2XhkG04jhsnG81OGF3Kf3JWjMHHe8Gk6qtiAMwnk2Z+MY+5uWFKdLx5QFhYl12 5yrgcjmWfq/fS3kCACZv3FIDMbYE+cwXB4K43OQQYiw3xldmFwkLCkID+2wBisSg3yObRW kF83gfpRWEyJGds0PrJ4zsIi4+jolay8OL7SlAqBlb/pwXL9cCezQRO0NMFfE4Wa1OXfhy hznRyfv2O6xUvwGDkUtXfp3oijbIaFDMVcdoSG1CfyUIe1mtU6XI2lVOY1V/FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788568517; 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=f8vNeaJix4Ko5x+Q2GxwL40z5E0Zr6ZMwpIHFOXO3IU=; b=TMDWpZx+/twxyAyefWyW3T+V0zuxDnYpxBnOtdsej3luNs51V08/4f2lppehDDOjjs5NdF Axndjgh9eN9TX5IoaztoncpNZjZzTd8f2w+TSB9/lzTIx7o4v/cOoNlyunPg7mWFTabM0L +ytXNriQdeI1Tc/6Kq+B35y4+j9OSwsfdivX2QoLgG4azhum10R4F5jeFMwED3aM6SEr77 1lzmGO1jNTvjRgoHptmjZwxXmKX2EblYvnPNVUQxlg88gqXm+Q8sEVvcvkEzoZ8eFfww3m RKe+R02Xg4kW3lDxyH6t1qa1PSE4jOdnkAEI512Ns80hWguTXdFWkaK/swipVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcDrP0smzz7t8 for ; Sat, 05 Sep 2026 00:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 00:35:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 34bc2da3ac66 - stable/15 - capsicum: add CAP_PTRACE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 34bc2da3ac66f3a1890c9a70713a1c6c8ee3f879 Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 00:35:17 +0000 Message-Id: <6a9b63c5.1d6ee.540206cc@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=34bc2da3ac66f3a1890c9a70713a1c6c8ee3f879 commit 34bc2da3ac66f3a1890c9a70713a1c6c8ee3f879 Author: Konstantin Belousov AuthorDate: 2026-07-07 23:46:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-05 00:33:37 +0000 capsicum: add CAP_PTRACE (cherry picked from commit 5f82dd8e91610ceafe7ddbc702d97ffe7573f53f) --- sys/kern/subr_capability.c | 1 + sys/sys/caprights.h | 1 + sys/sys/capsicum.h | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index 55d6225fd67a..f5242216a2a2 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -93,6 +93,7 @@ const cap_rights_t cap_pdgetpid_rights = CAP_RIGHTS_INITIALIZER(CAP_PDGETPID); const cap_rights_t cap_pdkill_rights = CAP_RIGHTS_INITIALIZER(CAP_PDKILL); const cap_rights_t cap_pdwait_rights = CAP_RIGHTS_INITIALIZER(CAP_PDWAIT); const cap_rights_t cap_pread_rights = CAP_RIGHTS_INITIALIZER(CAP_PREAD); +const cap_rights_t cap_ptrace_rights = CAP_RIGHTS_INITIALIZER(CAP_PTRACE); const cap_rights_t cap_pwrite_rights = CAP_RIGHTS_INITIALIZER(CAP_PWRITE); const cap_rights_t cap_read_rights = CAP_RIGHTS_INITIALIZER(CAP_READ); const cap_rights_t cap_recv_rights = CAP_RIGHTS_INITIALIZER(CAP_RECV); diff --git a/sys/sys/caprights.h b/sys/sys/caprights.h index 296fac3b6231..09cce5fa8c5c 100644 --- a/sys/sys/caprights.h +++ b/sys/sys/caprights.h @@ -95,6 +95,7 @@ extern const cap_rights_t cap_pdgetpid_rights; extern const cap_rights_t cap_pdkill_rights; extern const cap_rights_t cap_pdwait_rights; extern const cap_rights_t cap_pread_rights; +extern const cap_rights_t cap_ptrace_rights; extern const cap_rights_t cap_pwrite_rights; extern const cap_rights_t cap_read_rights; extern const cap_rights_t cap_recv_rights; diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h index aa3f2f1bccdf..d912d10bc4e2 100644 --- a/sys/sys/capsicum.h +++ b/sys/sys/capsicum.h @@ -299,7 +299,9 @@ /* Allows pddupfd(2). */ #define CAP_PDDUPFD CAPRIGHT(1, 0x0000000000800000ULL) -#define CAP_UNUSED1_25 CAPRIGHT(1, 0x0000000001000000ULL) +/* Allows ptrace(PT_PROCDESC) */ +#define CAP_PTRACE CAPRIGHT(1, 0x0000000001000000ULL) + #define CAP_UNUSED1_26 CAPRIGHT(1, 0x0000000002000000ULL) #define CAP_UNUSED1_27 CAPRIGHT(1, 0x0000000004000000ULL) #define CAP_UNUSED1_28 CAPRIGHT(1, 0x0000000008000000ULL) @@ -333,8 +335,8 @@ #define CAP_UNUSED1_56 CAPRIGHT(1, 0x0080000000000000ULL) #define CAP_UNUSED1_57 CAPRIGHT(1, 0x0100000000000000ULL) -/* All used bits for index 1. */ -#define CAP_ALL1 CAPRIGHT(1, 0x0000000000FFFFFFULL) +/* All default bits for index 1. */ +#define CAP_ALL1 CAPRIGHT(1, 0x0000000001FFFFFFULL) /* Backward compatibility. */ #define CAP_POLL_EVENT CAP_EVENT