From nobody Tue Aug 18 01:27:59 2026 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 4hPBsW4cjvz6phHt for ; Tue, 18 Aug 2026 01:27:59 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hPBsW3Srrz4HQM for ; Tue, 18 Aug 2026 01:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787016479; 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: content-transfer-encoding:content-transfer-encoding; bh=zi3v6/yEg1niB7QeN0B7D1UVi0vlTBUzOGPDLiZs0/8=; b=X8mTe9xASe5jPHhIHpri/NEvrIBK+FcrmHA78jxbZh2x6jA/6WzdJAUnuqSRgepkPtxN5K 5R7Txo0FHhUKrtkjCHbUKRS4GDktGxrXSXcP5lOejWtRR4vMOu4h1/ykJsqSP16IWOb6fA 1qaP97pnFsERP5m1wkTXfftFrCkjIR3sXy3c1ohOiQROlvjFmuCcWHJgzbGNynkxOwR0Du OdCEU75qy98nKcAO/xbxaFGD0DFyJB2Ms+uyCjnIgph7CbJhEx66jgjOngwjF+JmWqZmaG BpYmMsWfA4VfzLYSW+Gu6pCRRItDv/R3Tg95eWlHp6IQSkPQb5Y85DQ5H+Gg+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787016479; a=rsa-sha256; cv=none; b=IpLmRfNjJv+Ac7QXkaIMbrkS7m30iYEBb7FMOav1tRmXby3FRFGBVCQVeTd0LkUqYLE0c1 vbOn5eakSa3a1PhFAVUFtAwaCoHBsuftstJN46iNXY6BBdsEInYCz7IVk5FiLkDmCog3Nz 5EjZmYtAPa65+brL2r3YSXF2Z0DNya2a7KnnLryPWGoBr9vuNA+ice/scRQVIfe27Rolfk PpM0jaJ/6WftKdff2WBAyqkRxKYY5w7K5sUq2Shn6cO6Rrvh3wCQaq+tKy7/EtJ7qZp7HY waxeCuDmzjPsbnnAG61cH306JNKPjMaf7rJLO9cdV7FNtmDNX2e8mGpsDsqxsw== 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=1787016479; 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: content-transfer-encoding:content-transfer-encoding; bh=zi3v6/yEg1niB7QeN0B7D1UVi0vlTBUzOGPDLiZs0/8=; b=auWgh49Im7RR55awzHbHkKSofQrDj7hd8Jfssnli/CjVoYbHd9kagVVHT543r8rK1ta9eG PgmqaDFSnBBnIFRWXPWCmMKTs/suT1hceUWvO1S84y1i1ofqHkZil4C1jP2YJ/iGQNkv2D tIJ3SVOmHMJq1qJ/l8k0eA6N+JRXSBjTnnm6kikPz/0E7AvyGvRfIWdyBEHzCV/u4sIvWn ltqW0R7GQDvchEsWysi4Knv0c03fJKyiT+qkjn2sEqyQEZvprPJEsCkAV7aKtpn0Pc066N iuimGti8qOM9TLr8Ag688s48j7HJaRkL/tmSm74MoExPSy5j7gJJ+YEV7rLWiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPBsW1tXKz7kb for ; Tue, 18 Aug 2026 01:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1830b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Aug 2026 01:27:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 2f580cc4c2eb - releng/14.5 - netipsec/xform_ipcomp.c: fix sockaddr type set in ipcomp6_nonexp_encapcheck() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 2f580cc4c2ebd9b0b9966ff76a7eade9d813a13a Auto-Submitted: auto-generated Date: Tue, 18 Aug 2026 01:27:59 +0000 Message-Id: <6a83b51f.1830b.1670ce3e@gitrepo.freebsd.org> The branch releng/14.5 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2f580cc4c2ebd9b0b9966ff76a7eade9d813a13a commit 2f580cc4c2ebd9b0b9966ff76a7eade9d813a13a Author: Konstantin Belousov AuthorDate: 2026-08-13 23:18:18 +0000 Commit: Colin Percival CommitDate: 2026-08-18 01:27:43 +0000 netipsec/xform_ipcomp.c: fix sockaddr type set in ipcomp6_nonexp_encapcheck() Approved by: re (cperciva) (cherry picked from commit 01d4e3c1d3ffa14041d8faa3a7a6e6509e73af84) (cherry picked from commit 3626363aaed8fa8becbb3c89ba0bbeeea6ae1139) --- sys/netipsec/xform_ipcomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index e8e098437ecc..6b1c88519c23 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -710,7 +710,7 @@ ipcomp6_nonexp_encapcheck(const struct mbuf *m, int off, int proto, return (0); bzero(&src, sizeof(src)); bzero(&dst, sizeof(dst)); - src.sa.sa_family = dst.sa.sa_family = AF_INET; + src.sa.sa_family = dst.sa.sa_family = AF_INET6; src.sin6.sin6_len = dst.sin6.sin6_len = sizeof(struct sockaddr_in6); ip6 = mtod(m, const struct ip6_hdr *); src.sin6.sin6_addr = ip6->ip6_src;