From nobody Wed Oct 28 16:59:13 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 4jFD9G22N6z6wmS7 for ; Wed, 28 Oct 2026 16:59:14 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFD9G05ytz3FWN for ; Wed, 28 Oct 2026 16:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793206754; 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=1NHH1+SoGZvdQ7AfTKvmF0RcP0BtfyryEMLxJYpkmtE=; b=AlXdqExiUUSelMf0eBdVi0jnX1BAJcg18BIhC6q6FNybtc5eC5dokNWnXgSW335/to8A/b 8VLBdxaCJv8mfvEVtWT7qBLEMYie86TodlQR/YGaKI04TDzVHQydprgnkUyRFJ+51SxOCy IAIE73kK84m+muFgqH0doRE66DRpoSgVkuGitR+qTAgyQfktO+eVR0ZOtCY1Y7H0WhV+2s s3/CejByT+NUphcH3WMDHA7pAI0P9kXuoSPwiaHi66uu8wVfvCZ5v/gp+D2Xuc/evpGRSa /mRcMlRXcAmcpmwMvj3fXcYqNz+UqF1TJCyVz0bsqTgZZ8pOo4faBTwdDPikkw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793206754; b=rSDmsN3LvPb4x0Xg9Mcjfp6A3ijZ3erp0KxYco5Sn+Sp4gSBLjS9ovipI9IPEcTHRsp6BD +SSTt0U0dgHfNOHyb+jyFNRwvMaxxxs+2zFGKA1vDm1nembhbsQXaIfRYiP+3CVrIcJrn3 A2jLjKI6aKu9OS/Fd5KcDKBWcFACB0bGfss8OgTYUdo9HT6l/Fg9niMX9c2z/t/dkcyCpT FFDm3+TkefaVpXmk5/a18szdt5l6haMJONxt7ZHN7OyS8cqQlWZJTnbT0gxy68e4qy1RO1 RXiJAvhf2uHQBC3JtYHbiLho315W4YZX6WeoKmhW1FU3tXotJ6T9Fhnik3XH0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793206754; 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=1NHH1+SoGZvdQ7AfTKvmF0RcP0BtfyryEMLxJYpkmtE=; b=pbVy9xwX0TF6sXYkVkssy1ChzUpYkioair/CjNgvkW+Qp7rpRu4so+0HMXwVIArk3Nvye3 fiNPg2Ro3rfLyMC1rhQfPVsEDj4xIJu4SjGdn6wqc8IDDQ5TRV1Ge1tSMyNaMXSIIP6MFf QcfDgnrtgBXVrVend1K6uNP/UbrNS4lKJmBQGsv10O2giujM/MCaXXgxGkrEv0Pn1UcUST ZlPEuolrx/1eDmFKbtzJRh1Hn3nDz6yothwreqXnbeU3AUptU25ugOXI6JZIlJ9XYDSxi6 l+he7zVnBbkGT42QDMNhTkz+zOPWFSvbhFOjM7PimWy+j/Ou8Ynf4EW+DGu3WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFD9F64Nzz1FqQ for ; Wed, 28 Oct 2026 16:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36638 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 16:59:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 267e4a1a8e9e - stable/15 - pfsync: use result of m_pullup() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 267e4a1a8e9ed75b20071a9604c4bb5aa43d4b39 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 16:59:13 +0000 Message-Id: <6ae229e1.36638.38dfcca2@gitrepo.freebsd.org> The branch stable/15 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=267e4a1a8e9ed75b20071a9604c4bb5aa43d4b39 commit 267e4a1a8e9ed75b20071a9604c4bb5aa43d4b39 Author: Gleb Smirnoff AuthorDate: 2026-10-15 04:50:41 +0000 Commit: Gleb Smirnoff CommitDate: 2026-10-28 16:58:19 +0000 pfsync: use result of m_pullup() (cherry picked from commit f84cdc2584305f8b656ce3f3746868c4a58a9a82) --- sys/netpfil/pf/if_pfsync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index db7db987197b..8ce0808527fe 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -979,7 +979,7 @@ pfsync_input(struct mbuf **mp, int *offp __unused, int proto __unused) } if (offset + sizeof(*ph) > m->m_len) { - if (m_pullup(m, offset + sizeof(*ph)) == NULL) { + if ((m = m_pullup(m, offset + sizeof(*ph))) == NULL) { V_pfsyncstats.pfsyncs_hdrops++; return (IPPROTO_DONE); } @@ -1082,7 +1082,7 @@ pfsync6_input(struct mbuf **mp, int *offp __unused, int proto __unused) } if (offset + sizeof(*ph) > m->m_len) { - if (m_pullup(m, offset + sizeof(*ph)) == NULL) { + if ((m = m_pullup(m, offset + sizeof(*ph))) == NULL) { V_pfsyncstats.pfsyncs_hdrops++; return (IPPROTO_DONE); }