diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2005-04-04 23:54:33 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2005-04-04 23:54:33 +0000 |
| commit | 266af80143e09dc7e7cbb83069d88ec0ca5cfe73 (patch) | |
| tree | df81bfcf7a02bdbfa09ae74ee5a9965ce31beb95 | |
| parent | 27ebb8491062ec1a3375808e3f440a08a1589381 (diff) | |
| download | src-266af80143e09dc7e7cbb83069d88ec0ca5cfe73.tar.gz src-266af80143e09dc7e7cbb83069d88ec0ca5cfe73.zip | |
MFC revision 1.103.
Security: FreeBSD-SA-05:02.sendfile
Approved by: so (nectar)
Notes
Notes:
svn path=/releng/4.8/; revision=144642
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 1 |
3 files changed, 5 insertions, 1 deletions
@@ -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: p29 FreeBSD-SA-05:02.sendfile + Correct kernel memory disclosure bug in sendfile(2). + 20050328: p28 FreeBSD-SA-05:01.telnet Correct buffer overflows in telnet(1). diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index b6944a9b6ac3..277f208382f9 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.8" -BRANCH="RELEASE-p28" +BRANCH="RELEASE-p29" 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)); } |