From owner-svn-src-all@FreeBSD.ORG  Wed Oct 17 20:23:08 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F151F163;
 Wed, 17 Oct 2012 20:23:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id D8F348FC12;
 Wed, 17 Oct 2012 20:23:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9HKN7Ur056120;
 Wed, 17 Oct 2012 20:23:07 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9HKN7fX056117;
 Wed, 17 Oct 2012 20:23:07 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201210172023.q9HKN7fX056117@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 17 Oct 2012 20:23:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241648 - head/sys/netinet/libalias
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Oct 2012 20:23:08 -0000

Author: emaste
Date: Wed Oct 17 20:23:07 2012
New Revision: 241648
URL: http://svn.freebsd.org/changeset/base/241648

Log:
  Avoid potential bad pointer dereference.
  
  Previously RuleAdd would leave entry->la unset for the first entry in
  the proxyList.
  
  Sponsored by: ADARA Networks
  MFC After: 1 week

Modified:
  head/sys/netinet/libalias/alias_proxy.c

Modified: head/sys/netinet/libalias/alias_proxy.c
==============================================================================
--- head/sys/netinet/libalias/alias_proxy.c	Wed Oct 17 20:17:56 2012	(r241647)
+++ head/sys/netinet/libalias/alias_proxy.c	Wed Oct 17 20:23:07 2012	(r241648)
@@ -210,13 +210,13 @@ RuleAdd(struct libalias *la, struct prox
 
 	LIBALIAS_LOCK_ASSERT(la);
 
+	entry->la = la;
 	if (la->proxyList == NULL) {
 		la->proxyList = entry;
 		entry->last = NULL;
 		entry->next = NULL;
 		return;
 	}
-	entry->la = la;
 
 	rule_index = entry->rule_index;
 	ptr = la->proxyList;