diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2010-07-13 02:45:17 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2010-07-13 02:45:17 +0000 |
| commit | 3e4fe68b17667d142097294cc1f00416a4e5ad2e (patch) | |
| tree | 2f2d7cd4cbcb287bfba237d3010b1960332fe5ce | |
| parent | 48a2dfb35961f9d14a3580b0fe97a3eb5dc486c0 (diff) | |
Notes
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 1 |
3 files changed, 6 insertions, 1 deletions
@@ -8,6 +8,10 @@ Items affecting the ports and packages system can be found in /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] diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3cab8a388393..6dbeccb24719 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -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 diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 9327eaee3a75..229bd72b8fcc 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -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; } /* |