Module Name: src
Committed By: riz
Date: Sat Apr 21 23:10:42 UTC 2012
Modified Files:
src/doc [netbsd-5]: CHANGES-5.2
src/sys/miscfs/genfs [netbsd-5]: genfs_io.c
Log Message:
Back out a commit included in the ticket 1750 patch which obviously
doesn't belong there.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.157 -r1.1.2.158 src/doc/CHANGES-5.2
cvs rdiff -u -r1.13.4.4 -r1.13.4.5 src/sys/miscfs/genfs/genfs_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.157 src/doc/CHANGES-5.2:1.1.2.158
--- src/doc/CHANGES-5.2:1.1.2.157 Sat Apr 21 16:06:07 2012
+++ src/doc/CHANGES-5.2 Sat Apr 21 23:10:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.157 2012/04/21 16:06:07 riz Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.158 2012/04/21 23:10:41 riz Exp $
A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
release:
@@ -6310,7 +6310,6 @@ sys/arch/hp700/hp700/intr.c 1.38
crypto/dist/openssl/crypto/mem.c patch
crypto/dist/openssl/crypto/asn1/a_d2i_fp.c patch
crypto/dist/openssl/crypto/buffer/buffer.c patch
-sys/miscfs/genfs/genfs_io.c patch
Address CVE-2012-2110.
[spz, ticket #1750]
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.13.4.4 src/sys/miscfs/genfs/genfs_io.c:1.13.4.5
--- src/sys/miscfs/genfs/genfs_io.c:1.13.4.4 Sat Apr 21 15:52:54 2012
+++ src/sys/miscfs/genfs/genfs_io.c Sat Apr 21 23:10:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.13.4.4 2012/04/21 15:52:54 riz Exp $ */
+/* $NetBSD: genfs_io.c,v 1.13.4.5 2012/04/21 23:10:42 riz Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.13.4.4 2012/04/21 15:52:54 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.13.4.5 2012/04/21 23:10:42 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -802,19 +802,7 @@ genfs_do_putpages(struct vnode *vp, off_
KASSERT(origflags & (PGO_CLEANIT|PGO_FREE|PGO_DEACTIVATE));
KASSERT((startoff & PAGE_MASK) == 0 && (endoff & PAGE_MASK) == 0);
-// KASSERT(startoff < endoff || endoff == 0);
-
-// replacement for the previous KASSERT to get debug output, by rmind
- if (!(startoff < endoff || endoff == 0)) {
- proc_t *p = curproc;
- mutex_exit(slock);
- printf("genfs_do_putpages: startoff 0x%lx, endoff 0x%lx vm_map %p\n", (uint64_t) startoff, (uint64_t) endoff, &p->p_vmspace->vm_map);
- void uvm_map_printit(struct vm_map *, bool, void (*)(const char *, ...));
- uvm_map_printit(&p->p_vmspace->vm_map, true, printf);
- KASSERT(p == l->l_proc);
- Debugger(); /* Bang ! */
- return EIO;
- }
+ KASSERT(startoff < endoff || endoff == 0);
UVMHIST_LOG(ubchist, "vp %p pages %d off 0x%x len 0x%x",
vp, uobj->uo_npages, startoff, endoff - startoff);
