details: https://anonhg.NetBSD.org/src/rev/17d216aad60b
branches: netbsd-3
changeset: 577785:17d216aad60b
user: tron <tron%NetBSD.org@localhost>
date: Sat Jan 28 10:19:16 2006 +0000
description:
Pull up following revision(s) (requested by peter in ticket #1139):
sys/dist/pf/net/pf_norm.c: revision 1.11
apply a fix from OpenBSD:
revision 1.104
date: 2006/01/18 22:03:21; author: dhartmei; state: Exp; lines: +2 -2
fix a bug in the fragment cache (used for 'scrub fragment crop/drop-ovl',
but not 'fragment reassemble'), which can cause some fragments to get
inserted into the cache twice, thereby violating an invariant, and panic-
ing the system subsequently. ok deraadt@
diffstat:
sys/dist/pf/net/pf_norm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (18 lines):
diff -r 265cec75cd6d -r 17d216aad60b sys/dist/pf/net/pf_norm.c
--- a/sys/dist/pf/net/pf_norm.c Sat Jan 28 10:17:08 2006 +0000
+++ b/sys/dist/pf/net/pf_norm.c Sat Jan 28 10:19:16 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_norm.c,v 1.7.10.1 2005/06/17 13:32:39 tron Exp $ */
+/* $NetBSD: pf_norm.c,v 1.7.10.2 2006/01/28 10:19:16 tron Exp $ */
/* $OpenBSD: pf_norm.c,v 1.96 2004/07/17 00:17:27 frantzen Exp $ */
/*
@@ -732,7 +732,7 @@
} else {
hosed++;
}
- } else {
+ } else if (frp == NULL) {
/* There is a gap between fragments */
DPFPRINTF(("fragcache[%d]: gap %d %d-%d (%d-%d)\n",
h->ip_id, -aftercut, off, max, fra->fr_off,