From nobody Thu Apr 10 13:37:18 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 4ZYLTW4FfTz5syFk; Thu, 10 Apr 2025 13:37:19 +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 4ZYLTW1FX9z3xSC; Thu, 10 Apr 2025 13:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744292239; 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=M/7Q8pTv92Jo6ZNohIFpPPrUz9p7iCh2uN7kQVjS0nw=; b=PL0A+moUtlsr71opRIdXlQ/JBvMDbVVyUxXH4peQcFwaZfcqQ4eBlL5+bBArRUSDcn3zRg IhUN4KkXk+dmjJvHoZHN0phyYl6sX761l3BlkCQjUdbMnNxL3j2+UWkczQpkeJpXdsjRrx NHvhNl+KbcmA3GOE92igYfDiHXR4XjxG+etmCyTPJ7lnX5DGWXg5EFymi0FzQ6RTSDLYwc sXV1b/K0abIVGSibWMg5oACfWSiU+WRG+TiMW59X5/aNqveAbvYQVug6DRIjQchA1wOCQm YeIqBMADfPIimBvte1ECu+Ej6gMRU1Zv6ka39g4Ax90pqSiXTomybqGhkMXh+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744292239; a=rsa-sha256; cv=none; b=O7iI2M6mtgfG0rRIQGn28J9D/yJsn1imGAigYVyIOMmc6dwQsZ2zBiRYVcIpzAhduwXN9c D5CZW7hz8xmR2N3dLhn08sSAahD4oQ1KndG8YBfsgotze46QIqXn7Lj8FuKDZlpf3GcXyZ uT6W2wtobcwD7FkL5iaN5P4GN90n74Y5GWkgok3opWgFrG/biJVZ+MEsqFyr4O1/KYcdI0 r4HgDcvfyEguS2O24WuotnzktE3fvuYrCtF5tyQ+wLz2WxM1kpCw2uLroSyRmluG7kNO4D jXfCBXR45yLBVuCIXega98tqbSEoFssIISk9OluEZHqfeUFNnxFi7kPGRx6CIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744292239; 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=M/7Q8pTv92Jo6ZNohIFpPPrUz9p7iCh2uN7kQVjS0nw=; b=f1avPXjAU5ls7HEEPqbEFqjl4QV86u5oVNY7tGnPhnqgq5J7CwQme1kNrlFN+TJ4EJcBFJ i/602wZWuTTnxe9gpgfMA/x8ktoiwRAtihSW+vklL7vFlZnNXJ/ZCsSZG0MG41J04FmXLt sIkuWNxHCWZe4c7udPJdVPUzzydeENlmNgC6SNAvCrU3XQ8Cz4lS+oGNbyy+6Z1HdNyTRz xJ+NlJmh4JzIj5uu7fUER+hPHoCZO9nXCLZODzzjwBA58BOAwLV1juBEdu2ZlDL5dToa/S v2XEzTF0LIPNLOLI/+O9glI+gUbVlc7/xVCPEqrkjAjlKMzydHthtUUxBAmhDg== 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 4ZYLTW0SRBz14hZ; Thu, 10 Apr 2025 13:37:19 +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 53ADbIhP007896; Thu, 10 Apr 2025 13:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ADbIOI007893; Thu, 10 Apr 2025 13:37:18 GMT (envelope-from git) Date: Thu, 10 Apr 2025 13:37:18 GMT Message-Id: <202504101337.53ADbIOI007893@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: 646b453110aa - main - pf: fix pf_ioctl_add_addr() validation 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: 646b453110aa78abef24f507e7ef4562a7109897 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=646b453110aa78abef24f507e7ef4562a7109897 commit 646b453110aa78abef24f507e7ef4562a7109897 Author: Kristof Provost AuthorDate: 2025-04-10 11:49:03 +0000 Commit: Kristof Provost CommitDate: 2025-04-10 13:36:41 +0000 pf: fix pf_ioctl_add_addr() validation Ensure we can only pass AF_UNSPEC, AF_INET or AF_INET6 (and only when supported in our kernel config). Reported-by: syzbot+8a9ee157bfed9e6b9efc@syzkaller.appspotmail.com Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 3ee5173c1313..44da2e156ce2 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2571,14 +2571,20 @@ pf_ioctl_add_addr(struct pf_nl_pooladdr *pp) pp->which != PF_RT) return (EINVAL); -#ifndef INET - if (pp->af == AF_INET) - return (EAFNOSUPPORT); + switch (pp->af) { +#ifdef INET + case AF_INET: + /* FALLTHROUGH */ #endif /* INET */ -#ifndef INET6 - if (pp->af == AF_INET6) - return (EAFNOSUPPORT); +#ifdef INET6 + case AF_INET6: + /* FALLTHROUGH */ #endif /* INET6 */ + case AF_UNSPEC: + break; + default: + return (EAFNOSUPPORT); + } if (pp->addr.addr.type != PF_ADDR_ADDRMASK && pp->addr.addr.type != PF_ADDR_DYNIFTL &&