From nobody Mon Oct 19 17:32:31 2026 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 4j7jKq5yZkz6vj17 for ; Mon, 19 Oct 2026 17:32:31 +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 4j7jKq3pp6z4fNw for ; Mon, 19 Oct 2026 17:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792431151; 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=8M79/+PQSIDwytaoWXKsLnn+L8gcVPHGCaV9pDWxIr4=; b=iV8KsVj5W6oPFz5D5WxmApweiidBEP0wd/yEJ8hRG64zz0kyvgIpSLJAICzeqqjaQiLofO 5Lk0Uspgyt1q1Q/x6q5whKK8DY9vBenjmnzSYBriFuU8uXMGSgQQVLF+jKEOvcYSuY8i5t lkDpt1QwofRTK846nkN8fTftH6tI6bFIcfgT5gJCZ+fnJNuSHx8BJeWjGprh1ia4D1NqUe zBNj8hrfUBeMIWjW5UBn7739k+hNPCHDR2NeO1uWvBCK/GhcY4vlm1P7r500zyG7XNNsgR 4geIeV/OSJ7PnA13PkwQ0zt2i1FzPlpw1fajhv9lTDN89zfDc5ZpXrpjnMvDdg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792431151; b=hO1fk6l72KNfz/JydWOITZPKKS+b9UIRlTQKSk5leUvBMlI7NiTKxN3NrWu7lr+ZUggpoH pXeShXUD3BAaWMUce8hmI1oylr2zq4f3UFRGdYay7RKaIad0h5dchwUFGFR2ovdAeT5rDP IntZOEYLME2f/+7TEP69KjU2jOIWJzQWhOboMlaPJY460Sowjmfu2f0FqjUd6yOVDKXcxE I5gXKa2Mxc68XtuwKFyxrbQ29W3fDRdytAHVrmX45Ooi6iTz1YkaYZOqBPjP7rLebmGAP7 7n4dOdcSsSKpwvL4sXZkT0ziar/lxY1og6vmpPPBaqXHnUstAnmKz+4yOzTo6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792431151; 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=8M79/+PQSIDwytaoWXKsLnn+L8gcVPHGCaV9pDWxIr4=; b=bgTnRhH1bBBevOg/BKJzlU/OWcGLLGtbSgHIaVRpU7cFg+2x7KYXC27JVQB1CmiYnUd1cg Ncq76gqPJgv+xc2kvZvbBAFGVt5zzeNO2SoREjr9xkQ0fNMq60VUq/8xmC5yxxks8W/XXn UQXtsI33WINJ6sNiN4DIa5xLKwOylir/juI7+S0mqZpzvYvf4HBPBxlKmMozpSeFGPv0E5 xVjC4E2QNDq/B5h9NGjdSi2aZyu/AHc7AgJMzbwhlBPjWu88Pp7YoSfBQzCHtTE10BJfrj Qj+ciEvvycgngBEzE/B6jjOCX1NK90LEVKXp1YByZduMGer2zj+CDKGNMqHN+Q== 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 4j7jKq2jn2zV3c for ; Mon, 19 Oct 2026 17:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22656 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Oct 2026 17:32:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4c72b1c36dda - main - ng_pppoe: fix m_pullup() logic List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: 4c72b1c36dda72b9ba8de593cac2c94e15f42bcf Auto-Submitted: auto-generated Date: Mon, 19 Oct 2026 17:32:31 +0000 Message-Id: <6ad6542f.22656.d44c30b@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4c72b1c36dda72b9ba8de593cac2c94e15f42bcf commit 4c72b1c36dda72b9ba8de593cac2c94e15f42bcf Author: Gleb Smirnoff AuthorDate: 2026-10-19 17:30:43 +0000 Commit: Gleb Smirnoff CommitDate: 2026-10-19 17:30:43 +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 --- 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));