From owner-svn-src-head@freebsd.org  Mon Mar 13 18:01:03 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18051D0AA9D;
 Mon, 13 Mar 2017 18:01:03 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DBED310A8;
 Mon, 13 Mar 2017 18:01:02 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2DI112q072032;
 Mon, 13 Mar 2017 18:01:01 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2DI11ue072031;
 Mon, 13 Mar 2017 18:01:01 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703131801.v2DI11ue072031@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 13 Mar 2017 18:01:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315206 - head/contrib/bsnmp/snmpd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Mar 2017 18:01:03 -0000

Author: ngie
Date: Mon Mar 13 18:01:01 2017
New Revision: 315206
URL: https://svnweb.freebsd.org/changeset/base/315206

Log:
  bsnmpd: fix segfault when trans_insert_port(..) is called with multiple
  out of order addresses
  
  Move `port->transport` initialization before the TAILQ_FOREACH(..) loop
  to ensure that the value is properly initialized before it's inserted
  into the TAILQ.
  
  MFC after:	1 week
  PR:		217760
  Submitted by:	eugen
  Sponsored by:	Dell EMC Isilon

Modified:
  head/contrib/bsnmp/snmpd/main.c

Modified: head/contrib/bsnmp/snmpd/main.c
==============================================================================
--- head/contrib/bsnmp/snmpd/main.c	Mon Mar 13 17:58:08 2017	(r315205)
+++ head/contrib/bsnmp/snmpd/main.c	Mon Mar 13 18:01:01 2017	(r315206)
@@ -765,13 +765,13 @@ trans_insert_port(struct transport *t, s
 {
 	struct tport *p;
 
+	port->transport = t;
 	TAILQ_FOREACH(p, &t->table, link) {
 		if (asn_compare_oid(&p->index, &port->index) > 0) {
 			TAILQ_INSERT_BEFORE(p, port, link);
 			return;
 		}
 	}
-	port->transport = t;
 	TAILQ_INSERT_TAIL(&t->table, port, link);
 }