aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2016-05-04 15:27:09 +0000
committerXin LI <delphij@FreeBSD.org>2016-05-04 15:27:09 +0000
commit03a95b12f377c99bf448a3777c46b6777327c243 (patch)
treef13dfb5b7971632ce82299c281a2b80a04479af7 /sys
parent5399f0d7531add543f1c06239ea3c1e4b3c41578 (diff)
downloadsrc-03a95b12f377c99bf448a3777c46b6777327c243.tar.gz
src-03a95b12f377c99bf448a3777c46b6777327c243.zip
Fix multiple OpenSSL vulnerabilitites. [SA-16:17]
Fix memory leak in ZFS. [EN-16:08] Approved by: so
Notes
Notes: svn path=/releng/9.3/; revision=299068
Diffstat (limited to 'sys')
-rw-r--r--sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c1
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c b/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
index a2532f80222e..49becbc1c1a0 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
@@ -196,6 +196,7 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath,
VI_UNLOCK(vp);
vrele(vp);
vfs_unbusy(mp);
+ vfs_freeopts(mp->mnt_optnew);
vfs_mount_destroy(mp);
*vpp = NULL;
return (error);
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 4572694c0e54..26ded0b4499d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="9.3"
-BRANCH="RELEASE-p40"
+BRANCH="RELEASE-p41"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi