From nobody Sat Mar 12 10:29:34 2022 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 A9E2B1A0500C; Sat, 12 Mar 2022 10:29:34 +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 4KFzZ63ZlLz4n16; Sat, 12 Mar 2022 10:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647080974; 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=Gn8yoMiqRuAdTlzLZ2bZT+b77SQVBpQstNJ85J3TFG8=; b=RK4wIzt6uXniMCEgx2jeyIvkOweNTgymBrnbih2Ow1k3HUjMELILhVlLx7OylJELoP0kJa M62UEwk+b+OylnTfo+yCEjyhl18q6mcG460yinyKAOXmKMUGtEYo/j6Q9dCUcHDZUt9IEl B7MGNCueZ6o4mTL6xtZrIirvYgJMf+CB+ECjAWxKCWDEPTx+3Ph9YUhXDd/4B0nRYwqOW5 W1j8iWsbRy7QoRm7ITDg3ZQdo4BhcDJoVymyS8QYBLvl86bPOwBq6d+6SC5xywQmyrZoWz pqRXqn85wkD0MUgFAdOgQcIG2dsLwUrTw+Y4KFls/P6H556ZlnEsHDgeH8Y8dQ== 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 388252B040; Sat, 12 Mar 2022 10:29:34 +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 22CATYMd022625; Sat, 12 Mar 2022 10:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CATYuo022624; Sat, 12 Mar 2022 10:29:34 GMT (envelope-from git) Date: Sat, 12 Mar 2022 10:29:34 GMT Message-Id: <202203121029.22CATYuo022624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 2c1ade6cd608 - stable/13 - cap_net: fix verification of bind permission 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c1ade6cd608aaa8a12885f42cde176afc417031 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647080974; 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=Gn8yoMiqRuAdTlzLZ2bZT+b77SQVBpQstNJ85J3TFG8=; b=Sv1omM0xOKkTm66Put81VEcPc77/6adWwcXLoenfFRQmPoUObMmAX6e/5BKOR8GgExXWkO ZFFMY8mP7lEqFrVCJdUjp+JqUDFSeaO1OjS3E+C30QFYZ4BlQ3xtjzGpEThDJ9uD17fL8I SPiA+p00khwFPRaRagU433L5oZJ5hEg7bWkf4omY2dyTWVj+zraluMXU2pxlhHkutYWD2C J59f0tV4gh3OOJhWFylonQccoOmx//yEspBcjy1m4jA1O2cSe9g5Qnp9mk0RrqQ0raIPQo ncA9ESOrNsRhzOJEmjVMkir4GBieyG14qSjgddCvYLuGeXDsyvZLtJ+bAQfBhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647080974; a=rsa-sha256; cv=none; b=ujS6o0YWi2AifGOjzTHYgSW2Q5IvPxfRCJt8QUqq82mWnKQn1HevrM3zjFb6J1w/q0Ry3w dqt9at0O5Ca5q3q2A0pwxJwfFiMuCcJxsB4jl2mYZNrboYpHK64xGgGNrqHSVhsoa7L4gi CmETw212qWZlGdJGEHj3NqOfflDwHIH5cxX4H6jZjY8oZBMOsbzWIH2r0SZHhmfOLqMozv TVVT57Iix9sa6H1Mr6O6Aa9tNqam4g+msBHurI2BV64jEF924GAkU+eDOfU8gkz6bGw+8W 06n1TSONHIFvQRMOa3P2KvaD33QoJfWYva4uAB1bIR4tz2pTpo3JO3fx4mRtrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=2c1ade6cd608aaa8a12885f42cde176afc417031 commit 2c1ade6cd608aaa8a12885f42cde176afc417031 Author: Mariusz Zaborski AuthorDate: 2021-12-14 11:01:10 +0000 Commit: Mariusz Zaborski CommitDate: 2022-03-12 10:28:42 +0000 cap_net: fix verification of bind permission MFC after: 5 days (cherry picked from commit f45ca435bd2cba2ea6d9b79dbef275bc5ea4036a) --- lib/libcasper/services/cap_net/cap_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index 1d5531676268..a1a66a05b5a2 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1378,7 +1378,7 @@ net_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits) */ if (oldlimits == NULL) return (0); - if (!hasconnect && nvlist_exists(oldlimits, LIMIT_NV_BIND)) + if (!hasbind && nvlist_exists(oldlimits, LIMIT_NV_BIND)) return (ENOTCAPABLE); if (!hasconnect && nvlist_exists(oldlimits, LIMIT_NV_CONNECT)) return (ENOTCAPABLE);