From nobody Thu Oct 17 16:29:48 2024 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 4XTtbK062jz5ZBn9; Thu, 17 Oct 2024 16:29:49 +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 4XTtbJ5LPrz44q0; Thu, 17 Oct 2024 16:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729182588; 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=QeiWI0puMsQYvhQ03RlTjMIsegZtJ7gtklzofRJuogg=; b=GQEVfZG6NEzJZOBKBl9I3wDUzaI8nGPMi2ksCznq+8AQU/YStPn7fqRa0FUx33YX1+wszJ TmWlOBRWf0C5hcZZRVMdz203vgAgfpMaqSAiMd88tfH7gt0Ztzkp0DNAuIrOpGhB2RqaQz 6N0fkDoTFEBf3Eqk5Gb4uQbpArTMQQOrsYpfpXfoodWJXekP0zwymgAQZF2lO1Mp2XTQc4 UWqAVjFiEgPR8nfPsfDtfeW+LzxGhhZ9r6UlG5HMUoYL/fBRsG/Y9dNPdnHxDDglwjtyqJ v2iiBuy2SZt9sW10Bkynrj5RA7HJxgLIiXGEY1CzF+5nWdDoJJovBGf6sIO62A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729182588; 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=QeiWI0puMsQYvhQ03RlTjMIsegZtJ7gtklzofRJuogg=; b=oPgHIfMGIp71ZuUzF1hAnrwke2hFByh6TihsUoZ3CWetKwC4hZqNqvydmOabYlSPzLsh2R dU44tpJwSdcUUx7HexVhOGYQyOogOqDG0xI/94zUCZCCMZyKxU77jdcJQyWbw8ndlGfaHM ENB3rxxBoQm4fy6cLGNcrMw6PwOX78JQL0M/EazH+zHuTIQkqOXSdklBGw424lsi1agYiN nFXwW1KNasMXnBuI70dxQK3ZU8rOwTDNeHJaUl96PRDSj3kA69flq+O0EmhOvhqoTR/96A HRdJzAnEVKWLdeEQeZds2qnpmEY4l6W7erDJ2i6+aXNpJoH1UDsxqhJ3fTRMGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729182588; a=rsa-sha256; cv=none; b=QccAmaxLZSYx8fxruVG9PNj0rhuoAUeHj3voPtvwqZz1J1K5DkjBIVZh10BWcreGVBMoVR BWdM9xLf995PCpSRK+kvDt9Xo96omA8GifnIgIzf1DVsWcYflb/4G3xzrf9r0PkfQ4kL7H pQkcE7/6vsIOHkB8RrF4WzWC8HGKg6JTAzBDvddtEnWIoMjkZoWb8I1zwm2o7ilfCkdLcT uRB37ZY3xXIHlqlKcShRStqdKDhzRg/faZnzof4gbQTOlxHg2ZH3X4wO62mVFgftExncwQ 8hyhJGb2A0M9gzHgPS2e8UFSsCEznTZ8K6Gngg571H4pw9OZ2FCmdvWscK/KHQ== 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 4XTtbJ4xkYzxRL; Thu, 17 Oct 2024 16:29:48 +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 49HGTm3w017346; Thu, 17 Oct 2024 16:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HGTmnT017343; Thu, 17 Oct 2024 16:29:48 GMT (envelope-from git) Date: Thu, 17 Oct 2024 16:29:48 GMT Message-Id: <202410171629.49HGTmnT017343@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: 202bbdcb1a2b - stable/14 - capsicum-test: rights are propagated on sctp_peeloff(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 202bbdcb1a2b67ddfad967db38969af5caa668d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=202bbdcb1a2b67ddfad967db38969af5caa668d7 commit 202bbdcb1a2b67ddfad967db38969af5caa668d7 Author: Ed Maste AuthorDate: 2024-10-07 18:28:20 +0000 Commit: Ed Maste CommitDate: 2024-10-17 16:29:21 +0000 capsicum-test: rights are propagated on sctp_peeloff(2) As of commit 91a9e4e01dab ("capsicum: propagate rights on sctp_peeloff") a capability is generated from sctp_peeloff(cap_fd,...). Enable the corresponding test code. PR: 201052 Reviewed by: oshogbo, tuexen Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47000 (cherry picked from commit 38518fda66cda6c57af0aa655d19c1897c0ab15d) --- 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 da7bb38f073b..13fa24a0f722 100644 --- a/contrib/capsicum-test/capsicum-freebsd.h +++ b/contrib/capsicum-test/capsicum-freebsd.h @@ -62,10 +62,9 @@ typedef unsigned long cap_ioctl_t; // 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 -// #define CAP_FROM_PEELOFF +// As of commit 91a9e4e01dab ("capsicum: propagate rights on sctp_peeloff") +// FreeBSD generates a capability from sctp_peeloff(cap_fd,...). +#define CAP_FROM_PEELOFF #endif /* __FreeBSD__ */