aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2005-05-08 10:29:54 +0000
committerColin Percival <cperciva@FreeBSD.org>2005-05-08 10:29:54 +0000
commit7b06159f3838a01d1a4b44dc13b7a87df9d0ab98 (patch)
tree4f5c1f089daad5a233cd5c3eb34f9b2a3d5f7e6c
parent7158f23c2ae2f5994437b6c7e4fda55129910670 (diff)
downloadsrc-7b06159f3838a01d1a4b44dc13b7a87df9d0ab98.tar.gz
src-7b06159f3838a01d1a4b44dc13b7a87df9d0ab98.zip
MFC: Fix two issues which were missed in FreeBSD-SA-05:08.kmem
Reported by: Uwe Doering Approved by: so (cperciva)
Notes
Notes: svn path=/releng/4.11/; revision=146005
-rw-r--r--UPDATING3
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/kern/uipc_usrreq.c1
-rw-r--r--sys/netinet/tcp_subr.c2
4 files changed, 7 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index d4f0e50b70aa..6f4c195a5e6f 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.
+20050508: p8 FreeBSD-SA-05:08.kmem
+ Correct two issues which were missed from the earlier commit.
+
20050506: p7 FreeBSD-SA-05:08.kmem
Correct several local kernel memory disclosure bugs.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 42557719c296..b8c050ec0d9a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.11"
-BRANCH="RELEASE-p7"
+BRANCH="RELEASE-p8"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index f8ac2630eaee..1ea6f253f66a 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -849,6 +849,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
unp = unp_list[i];
if (unp->unp_gencnt <= gencnt) {
struct xunpcb xu;
+ bzero(&xu, sizeof(xu));
xu.xu_len = sizeof xu;
xu.xu_unpp = unp;
/*
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index ee17d040e59c..240ffb9ba98e 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -898,6 +898,8 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
if (inp->inp_gencnt <= gencnt) {
struct xtcpcb xt;
caddr_t inp_ppcb;
+
+ bzero(&xt, sizeof(xt));
xt.xt_len = sizeof xt;
/* XXX should avoid extra copy */
bcopy(inp, &xt.xt_inp, sizeof *inp);