From nobody Mon Apr 15 04:02:02 2024 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 4VHtlv0Vs7z5HgJ0; Mon, 15 Apr 2024 04:02:03 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VHtlt4bDJz4Skh; Mon, 15 Apr 2024 04:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713153722; 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=0jX4CJrczXkMH4KhBGCwxCzW3APabeSaUmqeCf9/W6w=; b=b0F8Y4ms6jvsfCWG7Ndc5guFOm8mof0lwW7UshrvzqF7WSoK658oaVVwNp7vF6IA7QF0oh Lmq+zJIlxMivW7GK0UoWKO0fXk4JLhn7X/URe6dJoqPSWtFY++nMxYuq9lKBfRUoFm51hV MpdaFRf2oRxy2Dapn+GOa1yBKoBfAYs+91mdglbFEKpuDV8f7OKI8y46EiDOfvXZlfPEak C1I9xA7IMDBCc2DWetOsC2HN2XXKDkxllO9HhDtJNa38cjdbM0502hasBywssfTofJ8mm2 y+utxkNJGfiLOEfQgbx04SC1j9JXaI2r26Nk5pjNX37xOOvZNPnN2gA5Y1YX3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713153722; a=rsa-sha256; cv=none; b=DBk1+LsnvIQ8hrYtbs9coNrMPPAPUKeIINPbtEQyL+a2sIrjeT67xrK3R8Uj/pSasxN5U/ twQOrzt7pc+DaX/AJif5SgUmchA8YA86qZ+i/434VZPDIXhuzCqOwb9lCxr1qQwAjTkkN8 NZl2IdwZ6Es4KBc6ZzrQweSELv1osic58PkoA8R898T/uME5AXaq/zhB2VXJX57b5uZjiM noMLypyAep/p1lwW7W90wZRoRn0CF+jl59mMkFMAf/Jo2t9c4NyhuK/pTQOTDpFAE+RTd+ vR+queQ/WkQDEMx+tP+3AprytFaxVnzNThORbR5dsSiFnL5dmfW+kUkORG9udg== 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=1713153722; 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=0jX4CJrczXkMH4KhBGCwxCzW3APabeSaUmqeCf9/W6w=; b=iEiK0dBXGfSz5sZ/CaxnZnQ4q1TCo5xQYnO9/yzu70AUFwCXjVjzPzoejv3DTcdXhoeDHf 7OcbbwUJugcdv6G2yYb9RJydi+BkLSOADCP/3NCx2/DBhXfK4Q86he4vFWfp2QGFPIkM7G 1vR6v/xI8X7Tk1Ia6qGKzOJ9dPMM3NgXcKova06OEVWPyS36c5SnsyBw4nm4bIh8B19INK g8hbsmbfAUZ5UKqa7JfCdRnGhZFDGhZVSCDrofl2Mrsi0eufIYmLGUSEbCwfxFEjYMTTnN sPw5OaRxIyKxtx314OI/WnyiAEwUfrkicuxObMjjqAf09UgzK4pM+SY3Etz99A== 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 4VHtlt48zgzlKh; Mon, 15 Apr 2024 04:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43F422dW050511; Mon, 15 Apr 2024 04:02:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43F422Mi050508; Mon, 15 Apr 2024 04:02:02 GMT (envelope-from git) Date: Mon, 15 Apr 2024 04:02:02 GMT Message-Id: <202404150402.43F422Mi050508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 4d65728d55a7 - stable/14 - ethernet: Fix logging of frame length 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d65728d55a754f2529ca2cfb87c9588146563d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4d65728d55a754f2529ca2cfb87c9588146563d0 commit 4d65728d55a754f2529ca2cfb87c9588146563d0 Author: Zhenlei Huang AuthorDate: 2024-04-08 16:44:33 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-15 04:00:37 +0000 ethernet: Fix logging of frame length Both the mbuf length and the total packet length are signed. While here, update a stall comment to reflect the current practice. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42390 (cherry picked from commit e7102929bf4fea4bf22855d2d6031edf6c413608) --- sys/net/if_ethersubr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 4a726831a3db..4d82bb0cfdca 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -536,10 +536,10 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m) return; } #endif - if (m->m_len < ETHER_HDR_LEN) { - /* XXX maybe should pullup? */ + if (__predict_false(m->m_len < ETHER_HDR_LEN)) { + /* Drivers should pullup and ensure the mbuf is valid */ if_printf(ifp, "discard frame w/o leading ethernet " - "header (len %u pkt len %u)\n", + "header (len %d pkt len %d)\n", m->m_len, m->m_pkthdr.len); if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); m_freem(m);