Date: Mon, 28 Jul 2025 17:46:44 +0200 From: Kristof Provost <kp@FreeBSD.org> To: Mark Johnston <markj@FreeBSD.org> 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() Message-ID: <6358D349-40F0-4C8C-9760-10CECC2D763D@FreeBSD.org> In-Reply-To: <202507281543.56SFh1NX032191@gitrepo.freebsd.org> References: <202507281543.56SFh1NX032191@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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=6efe8e6be4135643d8283fcb6773da641326f427 > > commit 6efe8e6be4135643d8283fcb6773da641326f427 > Author: Mark Johnston <markj@FreeBSD.org> > AuthorDate: 2025-07-27 13:23:22 +0000 > Commit: Mark Johnston <markj@FreeBSD.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 > 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 ^— This hunk might not have been intended to be part of this. — Kristof [-- Attachment #2 --] <!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/xhtml; charset=utf-8"> </head> <body><div style="font-family: sans-serif;"><div class="markdown" style="white-space: normal;"> <p dir="auto">On 28 Jul 2025, at 17:43, Mark Johnston wrote:</p> <blockquote style="margin: 0 0 5px; padding-left: 5px; border-left: 2px solid #136BCE; color: #136BCE;"> <p dir="auto">The branch main has been updated by markj:</p> <p dir="auto">URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=6efe8e6be4135643d8283fcb6773da641326f427">https://cgit.FreeBSD.org/src/commit/?id=6efe8e6be4135643d8283fcb6773da641326f427</a></p>; <p dir="auto">commit 6efe8e6be4135643d8283fcb6773da641326f427<br> Author: Mark Johnston <a href="mailto:markj@FreeBSD.org">markj@FreeBSD.org</a><br> AuthorDate: 2025-07-27 13:23:22 +0000<br> Commit: Mark Johnston <a href="mailto:markj@FreeBSD.org">markj@FreeBSD.org</a><br> CommitDate: 2025-07-28 15:40:20 +0000</p> <pre style="margin-left: 15px; margin-right: 15px; padding: 5px; border: thin solid gray; overflow-x: auto; max-width: 90vw; background-color: #E4E4E4;"><code style="padding: 0 0.25em; background-color: #E4E4E4;">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 </code></pre> <hr> <p dir="auto">sys/amd64/conf/SYZKALLER | 5 +++++<br> sys/netpfil/pf/pf_ioctl.c | 16 ++++++++--------<br> 2 files changed, 13 insertions(+), 8 deletions(-)</p> <p dir="auto">diff --git a/sys/amd64/conf/SYZKALLER b/sys/amd64/conf/SYZKALLER<br> new file mode 100644<br> index 000000000000..49059302793b<br> --- /dev/null<br> +++ b/sys/amd64/conf/SYZKALLER<br> @@ -0,0 +1,5 @@<br> +include GENERIC<br> +ident SYZKALLER<br> +<br> +options COVERAGE<br> +options KCOV</p> </blockquote> <p dir="auto">^— This hunk might not have been intended to be part of this.</p> <p dir="auto">—<br> Kristof</p> </div> </div> </body> </html>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6358D349-40F0-4C8C-9760-10CECC2D763D>