From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 19 16:39:10 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5896FD3B;
 Mon, 19 Nov 2012 16:39:10 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3AC768FC16;
 Mon, 19 Nov 2012 16:39:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJGdAB6000750;
 Mon, 19 Nov 2012 16:39:10 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJGdAiM000749;
 Mon, 19 Nov 2012 16:39:10 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201211191639.qAJGdAiM000749@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 19 Nov 2012 16:39:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r243287 - stable/8/sys/netinet/libalias
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 16:39:10 -0000

Author: emaste
Date: Mon Nov 19 16:39:09 2012
New Revision: 243287
URL: http://svnweb.freebsd.org/changeset/base/243287

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

Modified:
  stable/8/sys/netinet/libalias/alias_proxy.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/netinet/libalias/alias_proxy.c
==============================================================================
--- stable/8/sys/netinet/libalias/alias_proxy.c	Mon Nov 19 16:16:34 2012	(r243286)
+++ stable/8/sys/netinet/libalias/alias_proxy.c	Mon Nov 19 16:39:09 2012	(r243287)
@@ -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;