summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authormlaier <mlaier@FreeBSD.org>2004-08-12 14:15:42 +0000
committermlaier <mlaier@FreeBSD.org>2004-08-12 14:15:42 +0000
commit939573c38dbfc0f16e52d1fbc7592aa5c72b4843 (patch)
tree1c4caefd1536be9da8505befe314a332c3368454 /sys/contrib
parent625a88ed3624b3578c43a4dd208957df8d5952bd (diff)
downloadFreeBSD-src-939573c38dbfc0f16e52d1fbc7592aa5c72b4843.zip
FreeBSD-src-939573c38dbfc0f16e52d1fbc7592aa5c72b4843.tar.gz
Loopback fix from Mathieu Sauve-Frankel:
Add missing check for NULL in DIOCCHANGERULE. This prevents a crash in certain rare cases.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/pf/net/pf_ioctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index b099d3e..4df9e37 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/* $OpenBSD: pf_ioctl.c,v 1.112.2.1 2004/04/30 21:43:30 brad Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1503,7 +1503,8 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
while ((oldrule != NULL) && (oldrule->nr != pcr->nr))
oldrule = TAILQ_NEXT(oldrule, entries);
if (oldrule == NULL) {
- pf_rm_rule(NULL, newrule);
+ if (newrule != NULL)
+ pf_rm_rule(NULL, newrule);
error = EINVAL;
splx(s);
break;
OpenPOWER on IntegriCloud