From nobody Tue Mar 4 16:00:04 2025 X-Original-To: dev-commits-src-all@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 4Z6gPK2vD7z5qHkV; Tue, 04 Mar 2025 16:00:05 +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 4Z6gPJ58w7z3H42; Tue, 04 Mar 2025 16:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741104004; 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=iMmUSKyKsLy7+G5ISTYgMMShd2aXqCY86fi/oivrqdc=; b=naBXIiGNV/0ikkvlbgxML7CnvTNc8ckdYvFTi+wHkGhCxrl5acBIDrV3FVp/XiKaJBN70S 0IGoJTRL5N8nKhlPCmnor+NtVouZIJ5sgEY3YwQZwFpkDrjfdylByvWBK+tSvdN+XyyODZ R/NUwBiVmQCdjF3j1CD6y3yX4TsFj9noPYJtHM+C6LK8yg1fnnCkGvzMIuDw/qM/zlCXqR bHZZNPb8jsSIHiEdyzp8cuq7d3IOMVV7/wBPXRm0b+F7ncKanBVZ3ssdDbdE4CFEb94OoM D9LTkbg2OljZ+GqCbisabVZYA/6Z8/edZziz42X0IFmC5H4K7Q5+iUrxz9qxSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741104004; a=rsa-sha256; cv=none; b=loWIHjj1NeWFwqywxXCHvDtMQf36lUYptnWK3sSGu4Yzdt+Q1fLcoaRgICCOhdamKw4H/C GtdHBcONicmfVdB+NgTxu9lJ0abSSnSmnPsMG8X5U6OHzo1rF49aRLrYkNDaSA80piHKZT /dZp7phhRJUVemuGfqOXUqQxpPJiHz7O6Gx64AtkQyeUvd5UjQHiqv0r+QNaLo2U+TnSlf Ec6i6L6tckXJKU1EkDxr+MsZZwpzBL6iId24yopg554ugqAm19mTygH+yrku+xwVdKM/ba Lp7oKw4qMCCL4WZRXKfeaayAxUZJBX7I1VRR7NIS4MBXqCLVKBNcIZWXbJg1wA== 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=1741104004; 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=iMmUSKyKsLy7+G5ISTYgMMShd2aXqCY86fi/oivrqdc=; b=mmfODVwQaOa3F0fNruLil2JHBAuh1yzDfCkd9KAZNmylvk13/tBWER5DlLlKEuKKcrkGzv Lb8FrHk0iKDOtlF5ao4ecLnLnmhxyGEV0MXVyz4LN+J53e+j9uH+aOG4iNDJtEx/s7rApd QydeOFoEyp3anv5KCf7DL4wJTTXQ82YgR9U++MQMxkZdERlMehdt9G7fC7dZdRJlTNfIOn fG9gUroG1h+/FVHepTTLfUcf8gHLUI+dMcxyJ2kcbos5mFE6QbuR41GSP5RjKh1QAYO7IC tOutq/puQgBt9EEE6a8nOFWt0jRwMlPZRDLes0QeoI8cKYnHYiex0SNV5JXK8w== 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 4Z6gPJ4mQLz8tQ; Tue, 04 Mar 2025 16:00:04 +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 524G04lh073575; Tue, 4 Mar 2025 16:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524G04dc073569; Tue, 4 Mar 2025 16:00:04 GMT (envelope-from git) Date: Tue, 4 Mar 2025 16:00:04 GMT Message-Id: <202503041600.524G04dc073569@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: 80b64ef0a10b - main - pf: don't assert on address family in pf_addrcpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 80b64ef0a10b87ff2f79d1a6e18ecdf3e3bee1b1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=80b64ef0a10b87ff2f79d1a6e18ecdf3e3bee1b1 commit 80b64ef0a10b87ff2f79d1a6e18ecdf3e3bee1b1 Author: Kristof Provost AuthorDate: 2025-03-04 11:56:08 +0000 Commit: Kristof Provost CommitDate: 2025-03-04 15:59:49 +0000 pf: don't assert on address family in pf_addrcpy() This gets called (through PF_ACPY()) on user supplied input, so we can't assume that the address family must be AF_INET or AF_INET6. Reported-by: syzbot+14dec0c55b8f512e271c@syzkaller.appspotmail.com Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ad6be0c67c2a..349b10c346a7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -811,8 +811,6 @@ pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) case AF_INET6: memcpy(&dst->v6, &src->v6, sizeof(dst->v6)); break; - default: - unhandled_af(af); } } #endif /* INET6 */