From 2277c5e5e228579e1951ee71ec60bbefe8842c36 Mon Sep 17 00:00:00 2001
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 27 Apr 2014 09:49:35 +0000
Subject: Do not delay freeing rtm. Bandaid added in r227061 is not needed
 since r227061,

MFC after:	1 month
---
 sys/net/rtsock.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'sys/net/rtsock.c')

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 626dc8fbab10..45ba6fd52a9a 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -842,7 +842,7 @@ flush:
 		/* There is another listener, so construct message */
 		rp = sotorawcb(so);
 	}
-	if (rtm) {
+	if (rtm != NULL) {
 #ifdef INET6
 		if (rti_need_deembed) {
 			/* sin6_scope_id is recovered before sending rtm. */
@@ -865,6 +865,7 @@ flush:
 			m = NULL;
 		} else if (m->m_pkthdr.len > rtm->rtm_msglen)
 			m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len);
+		Free(rtm);
 	}
 	if (m) {
 		M_SETFIB(m, fibnum);
@@ -881,9 +882,6 @@ flush:
 		} else
 			rt_dispatch(m, saf);
 	}
-	/* info.rti_info[RTAX_DST] (used above) can point inside of rtm */
-	if (rtm)
-		Free(rtm);
     }
 	return (error);
 }
-- 
cgit v1.2.3