aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Konovalov <maxim@FreeBSD.org>2006-03-02 05:48:22 +0000
committerMaxim Konovalov <maxim@FreeBSD.org>2006-03-02 05:48:22 +0000
commitc2ceacfdd966c8166213d94ca65a60c9a09296e1 (patch)
tree824c71f680a7385a083fc8b79910ecbc74127893
parent7c3e674880c629c9c65a7e54c46b768a1569e3d7 (diff)
downloadsrc-c2ceacfdd966c8166213d94ca65a60c9a09296e1.tar.gz
src-c2ceacfdd966c8166213d94ca65a60c9a09296e1.zip
o Merge SA-06:10.nfs.
Approved by: so (cperciva)
Notes
Notes: svn path=/releng/4.9/; revision=156202
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/nfs/nfs_socket.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index b90838c24ce3..7fd759d2fe8d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,10 @@ 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.
+20060302: p23 FreeBSD-SA-06:10.nfs
+ Correct a remote kernel panic when processing zero-length RPC
+ records via TCP.
+
20060118: p22 FreeBSD-SA-06:01.texindex, FreeBSD-SA-06:02.ee,
FreeBSD-SA-06:03.cpio
Correct insecure temporary file usage in texindex. [06:01]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c26bb500f308..7fc16d869770 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.9"
-BRANCH="RELEASE-p22"
+BRANCH="RELEASE-p23"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index fa39a21cad6d..31b4f82820bd 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -2189,7 +2189,7 @@ nfsrv_getstream(slp, waitflag)
slp->ns_flag |= SLP_LASTFRAG;
else
slp->ns_flag &= ~SLP_LASTFRAG;
- if (slp->ns_reclen > NFS_MAXPACKET) {
+ if (slp->ns_reclen > NFS_MAXPACKET || slp->ns_reclen <= 0) {
slp->ns_flag &= ~SLP_GETSTREAM;
return (EPERM);
}