From nobody Sun Sep 17 14:29:50 2023 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 4RpVgg0HKxz4svLF; Sun, 17 Sep 2023 14:29:51 +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 4RpVgf6xtsz3cKB; Sun, 17 Sep 2023 14:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694960991; 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=h44VBzjU1/UTP609Bvbk9LlD1OwFHZ+B8pRcFdIJt0g=; b=mn24yPvr9yo7FxgJNYaavq8chaHX/+/JembVW7KW3xPREYMAhBy3xdLrPzA51TIdzvlveo PUh4D+mmgELE780ZQwk4oRODtBIR3FmpO9HY+uHWCJXLdA1aMAal3PGR37UqjdXEkoQimg OQBnIi4AdHyjXw6MqETj9jYP5OpfkqKxAKOFyrvrjVbDo2ztIi4VnFUu3fvjgPzKm8tsmx t58TzuuMYNWQmV879ZPkb+b3ZbcI2ndBnVtoO9aNdHsMAVTn66PjgMoOZowUGTZh+xJEhg CBEZVCaft3X3RPKTLRf29X1KwjxszM1fHEkySTmChbQO+mZ9vppYePKCD/n8Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694960991; a=rsa-sha256; cv=none; b=HhEK8qp25TCbSEZLNiEa+/7te7Ze17alkoAnGGLA3AD7IDN0ZC4Mm+vtTPqotuuoJX3QRs k/554zIEA0tr/TspltjA78JEZ0nXl0/mPW6c72kc8sPNiEJNkbKjj5djacNNV4lVXbOGQB 1gkn6TOXw1fPefq0Hjza0Hvq4K2coFNDI6BiaBM+mHBT3V0ylRNAizQGXj0vXR1eMMdEAJ /wdmKvxCcIJ45GiUEfM1QkpzAAUFd7wG5Nz3VFIScRPJOhD+QlePytVqQItZZKnoKePihA p1xKA1Ni7RblrTQuOiy7qCQgsZL2KeUcwhajTjKcUE5D/56B516Eig6dMdAUVQ== 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=1694960991; 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=h44VBzjU1/UTP609Bvbk9LlD1OwFHZ+B8pRcFdIJt0g=; b=kY1wpzDc8jNnXvyHBN+ZWunKdQbLap4EabjEd16qpAQLJRnjC0wFxauTgQEq6yn6a6NFEh X41py9+Pp5GPPkquUoJaMd2aG7docXVUKvyNaTJHoBT+ESx/47jwOJj8/wTAaYYuAZRZ3N 5m0HlpBMdbD3dsNbgfrj2CiIUT57egCCJZeTbVhXRQLdL0VExF0FEOHTK06ndN4+OI4Zdw J8ZbWTbjrG6FUfzZgNHc7xdBQMke/SkdZJgnDZYxRZCsfmWkKzJIC1ydpm0RH/3cEXfJnT 2+/8rsRm4nv5uWxL9QukfkfTPNCiLtk4akvf1E7DOOxW7xG8GBUBb208/3bpPQ== 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 4RpVgf62WBzs5D; Sun, 17 Sep 2023 14:29:50 +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 38HEToVC006022; Sun, 17 Sep 2023 14:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HETowg006019; Sun, 17 Sep 2023 14:29:50 GMT (envelope-from git) Date: Sun, 17 Sep 2023 14:29:50 GMT Message-Id: <202309171429.38HETowg006019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 7965d4d9e326 - stable/13 - net/bpf: Fix writing of buffer bigger than PAGESIZE 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: Sender: owner-dev-commits-src-all@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7965d4d9e326373b4669e451d3bd2a7d840c4b5b Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7965d4d9e326373b4669e451d3bd2a7d840c4b5b commit 7965d4d9e326373b4669e451d3bd2a7d840c4b5b Author: Florian Florensa AuthorDate: 2023-09-17 14:16:07 +0000 Commit: Warner Losh CommitDate: 2023-09-17 14:17:51 +0000 net/bpf: Fix writing of buffer bigger than PAGESIZE When allocating the mbuf we used m_get2 which fails if len is superior to MJUMPAGESIZE, if its the case, use m_getjcl instead. Reviewed by: kp@ PR: 205164 Pull Request: https://github.com/freebsd/freebsd-src/pull/131 (cherry picked from commit f13da24715a75ce0fdac31062866877d980aa908) --- sys/net/bpf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 6656b4aca980..20c26892ce7a 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -641,7 +641,15 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp, if (len < hlen || len - hlen > ifp->if_mtu) return (EMSGSIZE); - m = m_get2(len, M_WAITOK, MT_DATA, M_PKTHDR); + /* Allocate a mbuf for our write, since m_get2 fails if len >= to MJUMPAGESIZE, use m_getjcl for bigger buffers */ + if (len < MJUMPAGESIZE) + m = m_get2(len, M_WAITOK, MT_DATA, M_PKTHDR); + else if (len <= MJUM9BYTES) + m = m_getjcl(M_WAITOK, MT_DATA, M_PKTHDR, MJUM9BYTES); + else if (len <= MJUM16BYTES) + m = m_getjcl(M_WAITOK, MT_DATA, M_PKTHDR, MJUM16BYTES); + else + m = NULL; if (m == NULL) return (EIO); m->m_pkthdr.len = m->m_len = len;