From nobody Fri Oct 11 15:26:20 2024 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 4XQ9Ss1Xcyz5Z2L4; Fri, 11 Oct 2024 15:26:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ9Sr6CKnz4p0V; Fri, 11 Oct 2024 15:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660380; 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=WLXBV2Qpntb2M/jXvBLMjic0fu79SlasStvLkvn62YY=; b=oNqQIlGgHnw4ROPZUqAcrENm+9yeLeMLEMe7BxbgpmvdZ0VNbH/9SdXbaoBor7IjlMPs+D uMBaSu38qCZmjCLBerFncIeGnu/jpgO8t+3mtKhXCk2+DMLegL6aAw2HuVydKhuMR1gNlF oFJi4ObIK2OyLZQsT2SaLMUxKJwJKrXFyYuyWx4Ce8AkjRiQztyALMe0dBAvBqPNyLcbMV LVX3FpsWeCVyrIX6ZYGpBe/D6YU6Mk9yhKpFCliaz/CGBJ7aYNJ3luVB8MxbMbY6KRExp7 +GMlCThu6gL5Tx6rwLSQQ73YDT5Ffbd6ctj4LfypD+yRkF7whjf4RyzbB5G24g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660380; 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=WLXBV2Qpntb2M/jXvBLMjic0fu79SlasStvLkvn62YY=; b=JtJHdUUSkoFn+Hj4xJWMjs8qalHWzDck6tkk5qGdke7wSVVYXPRPo1v9XeRBX9sg3aqxYn We7+Ils3GZWczG7qkKyi7eDiAhh+CY7ComRncPoa0dexzfCfCLol/56EctJCiZKjHo0iZG 19TIXXALIpnFu7sdd1GK/iSnYrb9Qbt9OiN/R44T/wKizqmVr4pCPt9heJN8qzxnrgVvrM 5YdhyjNcRIA/DxdPBSSiqsllxrLkgEhxP/FIr3vea4vhnhtogJJT1BcmRx6/YlFCzb7fgb FhMewTVoRYgF0Ka8S+vUfAjRI55xGydE96qhi2dqEXugTkDUroLytMlvi/9QTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728660380; a=rsa-sha256; cv=none; b=grARErvk3fJ7NpvWgHcfpfgF6FbZJr4dZCaU0gVr+rBCkLSz3+u60MbdMKhIzefnkX+gY1 7j664rXk+XqDWYY6+rF77/CaSxgW3g3cnAkZREn6tEoyme5v3/q8USNIryMMeqOH1ZsvKC EE6S//F89AVY/MJs3zqdJnjW4I+YJ7zkvh/AuVQy75m4gEsvPIigVlaTrRWppfGrMBduEP ZCXPX8UaGsSWogApETLXDhwkAL80g1UeQc1E68MitSesk/1sbM0xJ5WW3rHat8qVV3ApcC AY2CCW3/3IAVwVvEPCwxrdi5Vmt//H6Sxvp0IpMeCBsNETJim3YLJAFmrg0ssw== 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 4XQ9Sr4QcSzmsH; Fri, 11 Oct 2024 15:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BFQKQ2037849; Fri, 11 Oct 2024 15:26:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFQK6B037846; Fri, 11 Oct 2024 15:26:20 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:26:20 GMT Message-Id: <202410111526.49BFQK6B037846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fbc593342cbf - stable/14 - capsicum-test: rights are propagated on accept(2) 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fbc593342cbf1ba962cf3266a245402169c0ffcf Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fbc593342cbf1ba962cf3266a245402169c0ffcf commit fbc593342cbf1ba962cf3266a245402169c0ffcf Author: Ed Maste AuthorDate: 2024-10-07 18:26:58 +0000 Commit: Ed Maste CommitDate: 2024-10-11 15:24:55 +0000 capsicum-test: rights are propagated on accept(2) As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)") a capability is generated from accept(cap_fd,...). Enable the corresponding test code. PR: 201052 Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46994 (cherry picked from commit 6684779b321590c71f162390bcf28feee2a3b967) --- contrib/capsicum-test/capsicum-freebsd.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/capsicum-test/capsicum-freebsd.h b/contrib/capsicum-test/capsicum-freebsd.h index 96ceb9b6d5f1..da7bb38f073b 100644 --- a/contrib/capsicum-test/capsicum-freebsd.h +++ b/contrib/capsicum-test/capsicum-freebsd.h @@ -59,10 +59,9 @@ typedef unsigned long cap_ioctl_t; // Too many links #define E_TOO_MANY_LINKS EMLINK -// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on accept. -// FreeBSD does not generate a capability from accept(cap_fd,...). -// https://bugs.freebsd.org/201052 -// #define CAP_FROM_ACCEPT +// As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)") +// FreeBSD generates a capability from accept(cap_fd,...). +#define CAP_FROM_ACCEPT // TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on sctp_peeloff. // FreeBSD does not generate a capability from sctp_peeloff(cap_fd,...). // https://bugs.freebsd.org/201052