From 20582936d05fd2f318afdb6483e2d3e32758ab0a Mon Sep 17 00:00:00 2001 From: sephe Date: Sun, 9 Sep 2007 05:11:28 +0000 Subject: [PATCH] NULL should never be passed to ether_poll_deregister(). Try catching any brain dead caller by assertion. --- sys/kern/kern_poll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index db1f0278cb..412c8960a2 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/kern_poll.c,v 1.2.2.4 2002/06/27 23:26:33 luigi Exp $ - * $DragonFly: src/sys/kern/kern_poll.c,v 1.30 2007/09/09 04:30:25 sephe Exp $ + * $DragonFly: src/sys/kern/kern_poll.c,v 1.31 2007/09/09 05:11:28 sephe Exp $ */ #include "opt_polling.h" @@ -524,8 +524,10 @@ ether_poll_deregister(struct ifnet *ifp) { int i; + KKASSERT(ifp != NULL); + crit_enter(); - if (ifp == NULL || (ifp->if_flags & IFF_POLLING) == 0) { + if ((ifp->if_flags & IFF_POLLING) == 0) { crit_exit(); return 0; } -- 2.11.4.GIT