From nobody Mon Jul 28 15:46:44 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 4brNBb6Vl9z63Cyl; Mon, 28 Jul 2025 15:46:47 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brNBb5kBxz3V5L; Mon, 28 Jul 2025 15:46:47 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753717607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UNy97HOg0KhOAe+VT57niJ3xfvHdGh9RESQ9oN1sgxs=; b=lbZ7x3lsc2bgy+usavn04xkbAge9S9Sl395SSi/Z4b18yY8dDiMQat62gdbF24Z/sLaOil krmXxaBV+nt79HwRBpdooSWnPav50lld2g968qk5suJAVNSnVFeX/ISD9xYd+05GFUvohY ydBHv3uehvQltwAtX1TCaBhUq+s/v7GEj9A40skCpSlnPzU+322//GbFIlT6LIKUrrEf9H OekGs1mIPYYlWvMx1PrzL+2yarD7Ol+jJBagkDf9oofO6NynnEEwOXBHApTEaOAa3xUNzT Z5QXMKbLCDiE4xn5uc2hUDGXEzNFcT9x7gBeWCjRbh2izrpsMhQ0yIAz4XiiQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753717607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UNy97HOg0KhOAe+VT57niJ3xfvHdGh9RESQ9oN1sgxs=; b=YoCoIErl1XjNXrChQDSAQ30Gpk4GyMiswLBZBbQsXUOYp3M4na1XoyYp9Eda5JG7+KXcSc AWKIJFwwmQeyOjPVWYTBfhYnBB28ljT/0Qgok4GJR1ujLgq57MIbPRNeeDagbh+ddA9gl4 QQBH/TKm9ibknOCHAn7WnC277PG2mtYJ1DSzIw5Gsem8qEkxHh3Oqs78t/d0P+D2dramRt q0plfcBcaHszQ5DA/qOLPUyBCTIo6swLcIe0sGH+y73RLZbMQx9EknHwI7NV3ptf5HVkW1 CF5LBIzEvZZGqQAeOKyv9TGoJyiFnKbHFsbVjBRBmPKF5EN6C/CXz6NzVW8zsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753717607; a=rsa-sha256; cv=none; b=r9lb3DTM1yFo9gmS8swyI7GlDPPzbrAl3R2AOJ71EE7F+s1B9WsYLSe/+E3mR5OOsAEbDT pMWSlyrgQ7rOz3/orpX2GTa5LN9B6huxtx9WLI2mbxwBZXb/FgiKYAerjI0dMKfcmgDCye 7VAvdFAIzim9UIfvOAkR0g2bkSb3MLh+yePSDW8hRWMAS3EFNJhXJfYCuV24dHsVRKNu5e eqRMUFKpJhLoIJEVXXxir78pFvOvpXQZKbVqyE5Ib9imhmU8b0kFCU8WTjmW4+P7qns7rC cPRSkgQcuRzq3DpiNR6KkVj+OjDJk80/od44y9y2rsPj0shsnhOLuWCQIMoYBw== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R10" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4brNBb4PqWzy0P; Mon, 28 Jul 2025 15:46:47 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id A8A614447D; Mon, 28 Jul 2025 17:46:45 +0200 (CEST) From: Kristof Provost To: Mark Johnston Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 6efe8e6be413 - main - pf: Fix a lock leak in pf_ioctl_addrule() Date: Mon, 28 Jul 2025 17:46:44 +0200 X-Mailer: MailMate (2.0r6272) Message-ID: <6358D349-40F0-4C8C-9760-10CECC2D763D@FreeBSD.org> In-Reply-To: <202507281543.56SFh1NX032191@gitrepo.freebsd.org> References: <202507281543.56SFh1NX032191@gitrepo.freebsd.org> 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: multipart/alternative; boundary="=_MailMate_F2A29105-5BD4-400E-B451-9F79A25EBDEF_=" --=_MailMate_F2A29105-5BD4-400E-B451-9F79A25EBDEF_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 28 Jul 2025, at 17:43, Mark Johnston wrote: > The branch main has been updated by markj: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D6efe8e6be4135643d8283fcb6773d= a641326f427 > > commit 6efe8e6be4135643d8283fcb6773da641326f427 > Author: Mark Johnston > AuthorDate: 2025-07-27 13:23:22 +0000 > Commit: Mark Johnston > CommitDate: 2025-07-28 15:40:20 +0000 > > pf: Fix a lock leak in pf_ioctl_addrule() > > The ERROUT macro assumes that the rules lock is held, but some = > error > paths arise before that lock is acquired. Introduce = > ERROUT_UNLOCKED for > that case. > > Reviewed by: kp > Reported by: syzkaller > Fixes: cc68decda316 ("pf: Reject rules with invalid port = > ranges") > Differential Revision: https://reviews.freebsd.org/D51571 > --- > sys/amd64/conf/SYZKALLER | 5 +++++ > sys/netpfil/pf/pf_ioctl.c | 16 ++++++++-------- > 2 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/sys/amd64/conf/SYZKALLER b/sys/amd64/conf/SYZKALLER > new file mode 100644 > index 000000000000..49059302793b > --- /dev/null > +++ b/sys/amd64/conf/SYZKALLER > @@ -0,0 +1,5 @@ > +include GENERIC > +ident SYZKALLER > + > +options COVERAGE > +options KCOV ^=E2=80=94 This hunk might not have been intended to be part of this. =E2=80=94 Kristof --=_MailMate_F2A29105-5BD4-400E-B451-9F79A25EBDEF_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 28 Jul 2025, at 17:43, Mark Johnston wrote:

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D6efe8e6be4135643d8283fcb6773da641326f427

commit 6efe8e6be4135643d8283fcb6773da641326f427
Author: Mark Johnston markj@Free= BSD.org
AuthorDate: 2025-07-27 13:23:22 +0000
Commit: Mark Johnston markj@Free= BSD.org
CommitDate: 2025-07-28 15:40:20 +0000

pf=
: Fix a lock leak in pf_ioctl_addrule()

The ERROUT macro assumes that the rules lock is held, but some error
paths arise before that lock is acquired.  Introduce ERROUT_UNLOCKED for
that case.

Reviewed by:    kp
Reported by:    syzkaller
Fixes:          cc68decda316 ("pf: Reject rules with invalid port ra=
nges")
Differential Revision:  https://reviews.freebsd.org/D51571

sys/amd64/conf/SYZKALLER | 5 +++++
sys/netpfil/pf/pf_ioctl.c | 16 ++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sys/amd64/conf/SYZKALLER b/sys/amd64/conf/SY= ZKALLER
new file mode 100644
index 000000000000..49059302793b
--- /dev/null
+++ b/sys/amd64/conf/SYZKALLER
@@ -0,0 +1,5 @@
+include GENERIC
+ident SYZKALLER
+
+options COVERAGE
+options KCOV

^=E2=80=94 This hunk might not have been intended to be p= art of this.

=E2=80=94
Kristof

--=_MailMate_F2A29105-5BD4-400E-B451-9F79A25EBDEF_=--