From nobody Wed Oct 28 16:59:14 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 4jFD9H0wSfz6wmbd for ; Wed, 28 Oct 2026 16:59:15 +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 4jFD9G5rkgz3FQR 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=gcHcD/WPss4lkHYjFitUtB64+YK1RQioO+ZTFH+yYho=; b=ZIARLmrFRi005WwutanKIP6iQM2e2RCBGo2NSbVUa6UWwf/VioW8r5CrDfPbBG9ziVkJBQ gJozspT7j6vp5nAI7leeSvwrYXoolPeDuJVc8FmLytu7LUPHa2ifNpjKIHI6/Qb7GEDyvH fJZ8IXg5Wf1RZcuRn4NvFa9pS6Gfq4wRNbkoBMg02XTL3IdRTzbyR4WQv2wz6gBVDsv380 S5HIo2E8JlENqAgI3RL7HUAsMdvBfQVADJj4Seor0r/M34Y5Ix8sxoE5VFRJOHzlciqTo8 53vWJXaPoRSxUFP3qBG2g14qIf+rdu3DVhodCiUyMs1UStI8tANuKy20HCNEJg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793206754; b=HMiumajnCVG71EGDSIWK2DqCuISrdzXzZq9/lKWKLFsjGsXbNbd6oEn0T8xwaqCvoukBp9 8QdHHiPh0hqRoEGurHx511sx5TJw3L1IhRp38lQHzPQ3wKZ3dbDOQeKMjEWAbGaCfWR4CS 9UUhrcYS6DuNyCNNc6aNlEd1egUPAD4TcZLZhhDlmNLbRO17FeDcUPPbEHfRebZ95SAhDy ancP8g8rMr8NaCVMu1/EBv+YUNCz/ae22tmN1tVt0lj16fP3OYXdhGi0VUTAaHDZXlW3HF Hh49xOVLLVcioIfvxC6XzZj1Fr2eAZ56sSO115BiQ2NXgd3xw4yIbr0ZeXZMJg== 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=gcHcD/WPss4lkHYjFitUtB64+YK1RQioO+ZTFH+yYho=; b=a9qA/NCmdnXHeE25+/r/zjDDKzoql3AeLN/99Qg0aAvoQ3M4teYTTJ8NeCVlw5IhsPDFL1 uN7DmI5JA97Ug6V/gg9BHj1c0H7gXt5SKJhvenNkqnGKZh37Gi5llpp6zyGBK8ctyIIhEP Prtqtj4x3EUGsHdTRM1wmdssD/wCnZti/vGmEK9J+Y18B1KarHYvYGrSk+D/VIGtNDCEhI RTllO3NHXQsURDv4S1LtKlz9UgJQOkZxzpxq9yDmDEEe+eAONAG+C/YEjULmoKzj8CZ4n2 Dvga6UdQC42hpeyBmk/iwbPGrynztMFXjU42QBMK0zvz2mFjly5WQYBplRvTCA== 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 4jFD9G5Wn1z1GBw for ; Wed, 28 Oct 2026 16:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36769 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 16:59:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 00c5cf7b6457 - stable/15 - ng_pppoe: fix m_pullup() logic 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: 00c5cf7b645785117e55ab34ce2f727a10c03200 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 16:59:14 +0000 Message-Id: <6ae229e2.36769.2c9fcc8a@gitrepo.freebsd.org> The branch stable/15 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=00c5cf7b645785117e55ab34ce2f727a10c03200 commit 00c5cf7b645785117e55ab34ce2f727a10c03200 Author: Gleb Smirnoff AuthorDate: 2026-10-19 17:30:43 +0000 Commit: Gleb Smirnoff CommitDate: 2026-10-28 16:58:35 +0000 ng_pppoe: fix m_pullup() logic The clear intent here is to do m_pullup() if we _don't_ have two bytes. Before the fix: a) m_pullup() was always called and did nothing; b) if a node was ever supplied with a fragmented but otherwise correct mbuf, then it would not handle PROT_LCP as intended. Noticed by: zlei Reviewed by: zlei, eugen_grosbein.net Differential Revision: https://reviews.freebsd.org/D60788 Fixes: 28903f396af4b151e16ea606cda66a9244fb179f (cherry picked from commit 4c72b1c36dda72b9ba8de593cac2c94e15f42bcf) --- sys/netgraph/ng_pppoe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c index 712efce31336..aaf1baf1e95e 100644 --- a/sys/netgraph/ng_pppoe.c +++ b/sys/netgraph/ng_pppoe.c @@ -1454,7 +1454,7 @@ ng_pppoe_rcvdata(hook_p hook, item_p item) } if (V_ng_pppoe_lcp_pcp && m->m_pkthdr.len >= 2 && - m->m_len >= 2 && (m = m_pullup(m, 2)) && + (m->m_len >= 2 || (m = m_pullup(m, 2))) && mtod(m, uint16_t *)[0] == htons(PROT_LCP)) EVL_APPLY_PRI(m, (uint8_t)(V_ng_pppoe_lcp_pcp & 0x7));