From nobody Wed Jul 9 08:59:00 2025 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 4bcX2s16cWz61NHV; Wed, 09 Jul 2025 08:59:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcX2s0L9tz3cQd; Wed, 09 Jul 2025 08:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752051541; 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=Q/xv5Dp+IIA/O8wOq4dDfbtXfx4Q00PvSA0FFKCzAUc=; b=YKjvaXKHLwkR6ZKzel00tIFUQalOwTY0ZpujT5jFdiMnp6gtVkjgs+Rc1jwUrETnSD60nG 7SQ/RVz8Ij20e2d49Aa7s2wKg52868txyL6VG1qyM6Y8KUV1smyYZ79+mbotxp/k7Em2HW +fFMoKMyu2jvXTl9BNELpXBcy0rCHxj0hD6lfHPkhU7Wa6xx8oG75SaTCT1xlwzKy36+8h AD5IDD+Ep2NNRGOa2JTC/6uGyyDdiWcpzpqJyFRbXa5r/ZbqagD9hBH142kzGSWzuh+6Uv m2TYMRNc59UebSGAFl6UfNvoihTjIdQvqqP1pvL63ohrmLluxgKlzEUWgsGJ/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752051541; 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=Q/xv5Dp+IIA/O8wOq4dDfbtXfx4Q00PvSA0FFKCzAUc=; b=IRFrRd1RquXpenjTUcNhrvdilh4ok0Eu0jucmZlLy63L8yyG0K+DDMNB+1gOzjdcXEtay2 hjkdYumwndiHES+PRpQXHs1djF1GQbvB8K5h1dMoUlUqjDm9On8nrNtmoAOaPcbrN8Ewb+ m2+xid/AfOAXo+xFxbj1GkNBxZ3JklBAMzo6iVJGlWuMZsFqsA+SrgCn+jfN0ex3HhRd8g aq6Uf007fSv/pyFqhzKdekp3cbcbFNU6Gqx2ybyXsZznFVkHw0AQFoXuTMcdI60g4aerAt M4ShVjtsfOWfyXna3ZjYtriMEc/3w8EN3CfLOYkWzLSr4+zLcAwJdXX5vwJneQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752051541; a=rsa-sha256; cv=none; b=kIlR6bW1w5Oe8esRjSaGlFFwZwkOyDijAm/XCkjKUD/1sQq21FII4VxErvcWViKXtAJbUT NhbA6odfuJS6mAXiJmxTe1o4It/rHMPAoj99CVtbe0lU5NckUdlKt8bHOxmDJ3OFFfqz/Y L01XSp/eUZz25FNh2MfF9rwDQxrtkUSiIIkfdp1lbLBVydozKBaIrklxfkMDjpMd0kpL10 7hHFJcRQLVO8Ko+u2PIol02NiYbVJ7Pzu+oWKGL6/f1BDvHCJUP+KkqEeRGfSx/gQgJuXJ HyozSZhTyH/+hvFz/AGO0m5RCFeufx3ECZ9gMFLNG5WoG0+ejDZvCUo/UIrIiQ== 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 4bcX2r6pMhz19R; Wed, 09 Jul 2025 08:59:00 +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 5698x0YC044782; Wed, 9 Jul 2025 08:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5698x0Sv044780; Wed, 9 Jul 2025 08:59:00 GMT (envelope-from git) Date: Wed, 9 Jul 2025 08:59:00 GMT Message-Id: <202507090859.5698x0Sv044780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: cface4d97af3 - main - pf: Use -1 to indicate an invalid uid/gid, not UID_MAX and GID_MAX. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cface4d97af3a84b7c4caa1ccd9090afcafe4a66 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=cface4d97af3a84b7c4caa1ccd9090afcafe4a66 commit cface4d97af3a84b7c4caa1ccd9090afcafe4a66 Author: Kristof Provost AuthorDate: 2025-07-03 09:26:37 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 08:57:48 +0000 pf: Use -1 to indicate an invalid uid/gid, not UID_MAX and GID_MAX. This is clearer and more consistent with the rest of the kernel. OK deraadt@ sashan@ Obtained from: OpenBSD, millert , d04cdf616e Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pflog.c | 2 +- sys/netpfil/pf/pf.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 6a87ea2471cb..0a84f9d680ac 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -289,7 +289,7 @@ pflog_packet(uint8_t action, u_int8_t reason, if (pd->lookup.done > 0) hdr.uid = pd->lookup.uid; else - hdr.uid = UID_MAX; + hdr.uid = -1; hdr.pid = NO_PID; hdr.rule_uid = rm->cuid; hdr.rule_pid = rm->cpid; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 127b29320acb..d5f01e5c4956 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4579,7 +4579,7 @@ pf_match_port(u_int8_t op, u_int16_t a1, u_int16_t a2, u_int16_t p) static int pf_match_uid(u_int8_t op, uid_t a1, uid_t a2, uid_t u) { - if (u == UID_MAX && op != PF_OP_EQ && op != PF_OP_NE) + if (u == -1 && op != PF_OP_EQ && op != PF_OP_NE) return (0); return (pf_match(op, a1, a2, u)); } @@ -4587,7 +4587,7 @@ pf_match_uid(u_int8_t op, uid_t a1, uid_t a2, uid_t u) static int pf_match_gid(u_int8_t op, gid_t a1, gid_t a2, gid_t g) { - if (g == GID_MAX && op != PF_OP_EQ && op != PF_OP_NE) + if (g == -1 && op != PF_OP_EQ && op != PF_OP_NE) return (0); return (pf_match(op, a1, a2, g)); } @@ -4914,8 +4914,8 @@ pf_socket_lookup(struct pf_pdesc *pd) struct inpcbinfo *pi; struct inpcb *inp; - pd->lookup.uid = UID_MAX; - pd->lookup.gid = GID_MAX; + pd->lookup.uid = -1; + pd->lookup.gid = -1; switch (pd->proto) { case IPPROTO_TCP: