aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2005-04-04 23:54:33 +0000
committerColin Percival <cperciva@FreeBSD.org>2005-04-04 23:54:33 +0000
commitf08630026f3235f913cf96ad8ffdbff3e7fd6277 (patch)
treec66aa353f1397ba603c488dc016a05884dfca324
parent04293d7d1ade5be5987bb1be9d46947aef3b8ac4 (diff)
downloadsrc-f08630026f3235f913cf96ad8ffdbff3e7fd6277.tar.gz
src-f08630026f3235f913cf96ad8ffdbff3e7fd6277.zip
MFC revision 1.103.
Security: FreeBSD-SA-05:02.sendfile Approved by: so (nectar)
Notes
Notes: svn path=/releng/4.11/; revision=144642
-rw-r--r--UPDATING3
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/ufs/ffs/ffs_inode.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index edb695ee9011..c66218c70723 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20050404: p2 FreeBSD-SA-05:02.sendfile
+ Correct kernel memory disclosure bug in sendfile(2).
+
20050328: p1 FreeBSD-SA-05:01.telnet
Correct buffer overflows in telnet(1).
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 39109ce246ab..ea723f07792c 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.11"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 169fde0ea97f..190f597d5f12 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -197,6 +197,7 @@ ffs_truncate(vp, length, flags, cred, p)
#endif
softdep_setup_freeblocks(oip, length);
vinvalbuf(ovp, 0, cred, p, 0, 0);
+ vnode_pager_setsize(vp, 0);
oip->i_flag |= IN_CHANGE | IN_UPDATE;
return (ffs_update(ovp, 0));
}