Lock down the network interface queues. The queue mutex must be obtained

before adding/removing packets from the queue.  Also, the if_obytes and
if_omcasts fields should only be manipulated under protection of the mutex.

IF_ENQUEUE, IF_PREPEND, and IF_DEQUEUE perform all necessary locking on
the queue.  An IF_LOCK macro is provided, as well as the old (mutex-less)
versions of the macros in the form _IF_ENQUEUE, _IF_QFULL, for code which
needs them, but their use is discouraged.

Two new macros are introduced: IF_DRAIN() to drain a queue, and IF_HANDOFF,
which takes care of locking/enqueue, and also statistics updating/start
if necessary.

1 files changed, 2 insertions, 10 deletions

diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c
index 4ce6a69..7fb9d21 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.c
+++ b/sys/contrib/ipfilter/netinet/ip_auth.c
@@ -286,9 +286,6 @@ int cmd;
 frentry_t *fr, **frptr;
 {
 	mb_t *m;
-#if defined(_KERNEL) && !SOLARIS
-	struct ifqueue *ifq;
-#endif
 	frauth_t auth, *au = &auth;
 	frauthent_t *fae, **faep;
 	int i, error = 0;
@@ -423,15 +420,10 @@ fr_authioctlloop:
 # if SOLARIS
 			error = fr_qin(fr_auth[i].fra_q, m);
 # else /* SOLARIS */
-			ifq = &ipintrq;
-			if (IF_QFULL(ifq)) {
-				IF_DROP(ifq);
-				m_freem(m);
+			if (! IF_HANDOFF(&ipintrq, m, NULL))
 				error = ENOBUFS;
-			} else {
-				IF_ENQUEUE(ifq, m);
+			else
 				schednetisr(NETISR_IP);
-			}
 # endif /* SOLARIS */
 			if (error)
 				fr_authstats.fas_quefail++;