From owner-svn-src-all@freebsd.org Tue Aug 20 17:49:34 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 81714D7000; Tue, 20 Aug 2019 17:49:34 +0000 (UTC) (envelope-from gordon@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46CdbL2qllz4brH; Tue, 20 Aug 2019 17:49:34 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42D2B6D94; Tue, 20 Aug 2019 17:49:34 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7KHnYux061210; Tue, 20 Aug 2019 17:49:34 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7KHnXdU061205; Tue, 20 Aug 2019 17:49:33 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201908201749.x7KHnXdU061205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 20 Aug 2019 17:49:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r351259 - in releng: 11.2/sys/kern 11.3/sys/kern 12.0/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.2/sys/kern 11.3/sys/kern 12.0/sys/kern X-SVN-Commit-Revision: 351259 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2019 17:49:34 -0000 Author: gordon Date: Tue Aug 20 17:49:33 2019 New Revision: 351259 URL: https://svnweb.freebsd.org/changeset/base/351259 Log: Fix IPv6 remote denial of service. Approved by: so Security: FreeBSD-SA-19:22.mbuf Security: CVE-2019-5611 Modified: releng/11.2/sys/kern/uipc_mbuf2.c releng/11.3/sys/kern/uipc_mbuf2.c releng/12.0/sys/kern/uipc_mbuf2.c Modified: releng/11.2/sys/kern/uipc_mbuf2.c ============================================================================== --- releng/11.2/sys/kern/uipc_mbuf2.c Tue Aug 20 17:46:40 2019 (r351258) +++ releng/11.2/sys/kern/uipc_mbuf2.c Tue Aug 20 17:49:33 2019 (r351259) @@ -214,7 +214,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp goto ok; } if ((off == 0 || offp) && M_LEADINGSPACE(n->m_next) >= hlen - && writable) { + && writable && n->m_next->m_len >= tlen) { n->m_next->m_data -= hlen; n->m_next->m_len += hlen; bcopy(mtod(n, caddr_t) + off, mtod(n->m_next, caddr_t), hlen); Modified: releng/11.3/sys/kern/uipc_mbuf2.c ============================================================================== --- releng/11.3/sys/kern/uipc_mbuf2.c Tue Aug 20 17:46:40 2019 (r351258) +++ releng/11.3/sys/kern/uipc_mbuf2.c Tue Aug 20 17:49:33 2019 (r351259) @@ -214,7 +214,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp goto ok; } if ((off == 0 || offp) && M_LEADINGSPACE(n->m_next) >= hlen - && writable) { + && writable && n->m_next->m_len >= tlen) { n->m_next->m_data -= hlen; n->m_next->m_len += hlen; bcopy(mtod(n, caddr_t) + off, mtod(n->m_next, caddr_t), hlen); Modified: releng/12.0/sys/kern/uipc_mbuf2.c ============================================================================== --- releng/12.0/sys/kern/uipc_mbuf2.c Tue Aug 20 17:46:40 2019 (r351258) +++ releng/12.0/sys/kern/uipc_mbuf2.c Tue Aug 20 17:49:33 2019 (r351259) @@ -216,7 +216,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp goto ok; } if ((off == 0 || offp) && M_LEADINGSPACE(n->m_next) >= hlen - && writable) { + && writable && n->m_next->m_len >= tlen) { n->m_next->m_data -= hlen; n->m_next->m_len += hlen; bcopy(mtod(n, caddr_t) + off, mtod(n->m_next, caddr_t), hlen);