summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhartmei <dhartmei@openbsd.org>2004-05-09 00:16:38 +0000
committerdhartmei <dhartmei@openbsd.org>2004-05-09 00:16:38 +0000
commitd424f7ce6f5a5490a8dfb91c61cfb07236eed8ea (patch)
treeb1b536ffa0f6e8e2955062368609f97fe2314238
parentzap another tiny header; ok deraadt@ (diff)
downloadwireguard-openbsd-d424f7ce6f5a5490a8dfb91c61cfb07236eed8ea.tar.xz
wireguard-openbsd-d424f7ce6f5a5490a8dfb91c61cfb07236eed8ea.zip
Don't dereference scrub pointer when it's NULL, fix PR 3775, from
Marc Huber. ok deraadt@
-rw-r--r--sys/net/pf_norm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index f95c57f9682..a6528496fb2 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_norm.c,v 1.85 2004/05/05 23:16:03 frantzen Exp $ */
+/* $OpenBSD: pf_norm.c,v 1.86 2004/05/09 00:16:38 dhartmei Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -1738,7 +1738,7 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd,
* TCP streams immedietly after the 3whs and don't timestamp their
* packets (seen in a WWW accelerator or cache).
*/
- if (pd->p_len > 0 && (src->scrub->pfss_flags &
+ if (pd->p_len > 0 && src->scrub && (src->scrub->pfss_flags &
(PFSS_TIMESTAMP|PFSS_DATA_TS|PFSS_DATA_NOTS)) == PFSS_TIMESTAMP) {
if (got_ts)
src->scrub->pfss_flags |= PFSS_DATA_TS;