From owner-svn-src-all@FreeBSD.ORG Tue Jul 13 02:45:19 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D563A1065675; Tue, 13 Jul 2010 02:45:19 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7D4C8FC1C; Tue, 13 Jul 2010 02:45:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6D2jJJ2091965; Tue, 13 Jul 2010 02:45:19 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6D2jJUf091953; Tue, 13 Jul 2010 02:45:19 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201007130245.o6D2jJUf091953@svn.freebsd.org> From: Colin Percival Date: Tue, 13 Jul 2010 02:45:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209964 - head/sys/kern releng/7.1 releng/7.1/sys/conf releng/7.1/sys/kern releng/7.3 releng/7.3/sys/conf releng/7.3/sys/kern releng/8.0 releng/8.0/sys/conf releng/8.0/sys/kern releng/8... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 13 Jul 2010 02:45:20 -0000 Author: cperciva Date: Tue Jul 13 02:45:17 2010 New Revision: 209964 URL: http://svn.freebsd.org/changeset/base/209964 Log: Correctly copy the M_RDONLY flag when duplicating a reference to an mbuf external buffer. Approved by: so (cperciva) Approved by: re (kensmith) Security: FreeBSD-SA-10:07.mbuf Modified: releng/7.1/UPDATING releng/7.1/sys/conf/newvers.sh releng/7.1/sys/kern/uipc_mbuf.c releng/7.3/UPDATING releng/7.3/sys/conf/newvers.sh releng/7.3/sys/kern/uipc_mbuf.c releng/8.0/UPDATING releng/8.0/sys/conf/newvers.sh releng/8.0/sys/kern/uipc_mbuf.c releng/8.1/UPDATING releng/8.1/sys/kern/uipc_mbuf.c Changes in other areas also in this revision: Modified: head/sys/kern/uipc_mbuf.c stable/7/sys/kern/uipc_mbuf.c stable/8/sys/kern/uipc_mbuf.c Modified: releng/7.1/UPDATING ============================================================================== --- releng/7.1/UPDATING Tue Jul 13 01:24:02 2010 (r209963) +++ releng/7.1/UPDATING Tue Jul 13 02:45:17 2010 (r209964) @@ -8,6 +8,10 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20100713: p13 FreeBSD-SA-10:07.mbuf + Correctly copy the M_RDONLY flag when duplicating a reference + to an mbuf external buffer. + 20100526: p12 FreeBSD-SA-10:05.opie Fix a one-NUL-byte buffer overflow in libopie. [10:05] Modified: releng/7.1/sys/conf/newvers.sh ============================================================================== --- releng/7.1/sys/conf/newvers.sh Tue Jul 13 01:24:02 2010 (r209963) +++ releng/7.1/sys/conf/newvers.sh Tue Jul 13 02:45:17 2010 (r209964) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.1" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/7.1/sys/kern/uipc_mbuf.c ============================================================================== --- releng/7.1/sys/kern/uipc_mbuf.c Tue Jul 13 01:24:02 2010 (r209963) +++ releng/7.1/sys/kern/uipc_mbuf.c Tue Jul 13 02:45:17 2010 (r209964) @@ -301,6 +301,7 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) n->m_ext.ref_cnt = m->m_ext.ref_cnt; n->m_ext.ext_type = m->m_ext.ext_type; n->m_flags |= M_EXT; + n->m_flags |= m->m_flags & M_RDONLY; } /* Modified: releng/7.3/UPDATING ============================================================================== --- releng/7.3/UPDATING Tue Jul 13 01:24:02 2010 (r209963) +++ releng/7.3/UPDATING Tue Jul 13 02:45:17 2010 (r209964) @@ -8,6 +8,10 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20100713: p2 FreeBSD-SA-10:07.mbuf + Correctly copy the M_RDONLY flag when duplicating a reference + to an mbuf external buffer. + 20100526: p1 FreeBSD-SA-10:05.opie, FreeBSD-SA-10:06.nfsclient Fix a one-NUL-byte buffer overflow in libopie. [10:05] Modified: releng/7.3/sys/conf/newvers.sh ============================================================================== --- releng/7.3/sys/conf/newvers.sh Tue Jul 13 01:24:02 2010 (r209963) +++ releng/7.3/sys/conf/newvers.sh Tue Jul 13 02:45:17 2010 (r209964) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.3" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/7.3/sys/kern/uipc_mbuf.c ============================================================================== --- releng/7.3/sys/kern/uipc_mbuf.c Tue Jul 13 01:24:02 2010 (r209963) +++ releng/7.3/sys/kern/uipc_mbuf.c Tue Jul 13 02:45:17 2010 (r209964) @@ -301,6 +301,7 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) n->m_ext.ref_cnt = m->m_ext.ref_cnt; n->m_ext.ext_type = m->m_ext.ext_type; n->m_flags |= M_EXT; + n->m_flags |= m->m_flags & M_RDONLY; } /* Modified: releng/8.0/UPDATING ============================================================================== --- releng/8.0/UPDATING Tue Jul 13 01:24:02 2010 (r209963) +++ releng/8.0/UPDATING Tue Jul 13 02:45:17 2010 (r209964) @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20100713: p4 FreeBSD-SA-10:07.mbuf + Correctly copy the M_RDONLY flag when duplicating a reference + to an mbuf external buffer. + 20100526: p3 FreeBSD-SA-10:04.jail, FreeBSD-SA-10:05.opie, FreeBSD-SA-10:06.nfsclient Change the current working directory to be inside the jail created by Modified: releng/8.0/sys/conf/newvers.sh ============================================================================== --- releng/8.0/sys/conf/newvers.sh Tue Jul 13 01:24:02 2010 (r209963) +++ releng/8.0/sys/conf/newvers.sh Tue Jul 13 02:45:17 2010 (r209964) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.0" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.0/sys/kern/uipc_mbuf.c ============================================================================== --- releng/8.0/sys/kern/uipc_mbuf.c Tue Jul 13 01:24:02 2010 (r209963) +++ releng/8.0/sys/kern/uipc_mbuf.c Tue Jul 13 02:45:17 2010 (r209964) @@ -302,6 +302,7 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) n->m_ext.ref_cnt = m->m_ext.ref_cnt; n->m_ext.ext_type = m->m_ext.ext_type; n->m_flags |= M_EXT; + n->m_flags |= m->m_flags & M_RDONLY; } /* Modified: releng/8.1/UPDATING ============================================================================== --- releng/8.1/UPDATING Tue Jul 13 01:24:02 2010 (r209963) +++ releng/8.1/UPDATING Tue Jul 13 02:45:17 2010 (r209964) @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20100713: FreeBSD-SA-10:07.mbuf + Correctly copy the M_RDONLY flag when duplicating a reference + to an mbuf external buffer. + 20100502: The config(8) command has been updated to maintain compatibility with config files from 8.0-RELEASE. You will need a new version Modified: releng/8.1/sys/kern/uipc_mbuf.c ============================================================================== --- releng/8.1/sys/kern/uipc_mbuf.c Tue Jul 13 01:24:02 2010 (r209963) +++ releng/8.1/sys/kern/uipc_mbuf.c Tue Jul 13 02:45:17 2010 (r209964) @@ -302,6 +302,7 @@ mb_dupcl(struct mbuf *n, struct mbuf *m) n->m_ext.ref_cnt = m->m_ext.ref_cnt; n->m_ext.ext_type = m->m_ext.ext_type; n->m_flags |= M_EXT; + n->m_flags |= m->m_flags & M_RDONLY; } /*