Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 29 Jul 2016 20:35:04 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r303505 - head/sys/ofed/drivers/infiniband/ulp/sdp
Message-ID:  <201607292035.u6TKZ4n8057363@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Fri Jul 29 20:35:04 2016
New Revision: 303505
URL: https://svnweb.freebsd.org/changeset/base/303505

Log:
  sdp: Use an mbufq for received control packets.
  
  This is simpler than the hand-rolled queue, and fixes a use-after-free.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h	Fri Jul 29 20:33:43 2016	(r303504)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h	Fri Jul 29 20:35:04 2016	(r303505)
@@ -403,8 +403,7 @@ struct sdp_sock {
 	struct sdp_rx_ring rx_ring;
 	struct sdp_tx_ring tx_ring;
 	struct rwlock	lock;
-	struct mbuf *rx_ctl_q;
-	struct mbuf *rx_ctl_tail;
+	struct mbufq	rxctlq;		/* received control packets */
 
 	int qp_active;	/* XXX Flag. */
 	int max_sge;

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c	Fri Jul 29 20:33:43 2016	(r303504)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c	Fri Jul 29 20:35:04 2016	(r303505)
@@ -469,6 +469,7 @@ sdp_attach(struct socket *so, int proto,
 	ssk->flags = 0;
 	ssk->qp_active = 0;
 	ssk->state = TCPS_CLOSED;
+	mbufq_init(&ssk->rxctlq, INT_MAX);
 	SDP_LIST_WLOCK();
 	LIST_INSERT_HEAD(&sdp_list, ssk, list);
 	sdp_count++;

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	Fri Jul 29 20:33:43 2016	(r303504)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	Fri Jul 29 20:35:04 2016	(r303505)
@@ -459,14 +459,9 @@ sdp_process_rx_mb(struct sdp_sock *ssk, 
 					ntohl(rrch->len));
 		}
 #endif
-		mb->m_nextpkt = NULL;
-		if (ssk->rx_ctl_tail)
-			ssk->rx_ctl_tail->m_nextpkt = mb;
-		else
-			ssk->rx_ctl_q = mb;
-		ssk->rx_ctl_tail = mb;
-
-		return 0;
+		if (mbufq_enqueue(&ssk->rxctlq, mb) != 0)
+			m_freem(mb);
+		return (0);
 	}
 
 	sdp_prf1(sk, NULL, "queueing %s mb\n", mid2str(h->mid));
@@ -611,11 +606,8 @@ sdp_do_posts(struct sdp_sock *ssk)
 		return;
 	}
 
-	while ((mb = ssk->rx_ctl_q)) {
-		ssk->rx_ctl_q = mb->m_nextpkt;
-		mb->m_nextpkt = NULL;
+	while ((mb = mbufq_dequeue(&ssk->rxctlq)) != NULL)
 		sdp_process_rx_ctl_mb(ssk, mb);
-	}
 
 	if (ssk->state == TCPS_TIME_WAIT)
 		return;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607292035.u6TKZ4n8057363>