From owner-svn-src-all@FreeBSD.ORG  Wed Nov 12 22:58:53 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5D41A268;
 Wed, 12 Nov 2014 22:58:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 49CD9795;
 Wed, 12 Nov 2014 22:58:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sACMwqKl048563;
 Wed, 12 Nov 2014 22:58:52 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACMwqGS048562;
 Wed, 12 Nov 2014 22:58:52 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201411122258.sACMwqGS048562@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 12 Nov 2014 22:58:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274455 - head/sys/netinet6
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.18-1
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, 12 Nov 2014 22:58:53 -0000

Author: ae
Date: Wed Nov 12 22:58:52 2014
New Revision: 274455
URL: https://svnweb.freebsd.org/changeset/base/274455

Log:
  We don't return sp pointer, thus NULL assignment isn't needed.
  And reference to sp will be freed at the end.
  
  MFC after:	1 week
  Sponsored by:	Yandex LLC

Modified:
  head/sys/netinet6/ip6_ipsec.c

Modified: head/sys/netinet6/ip6_ipsec.c
==============================================================================
--- head/sys/netinet6/ip6_ipsec.c	Wed Nov 12 22:51:30 2014	(r274454)
+++ head/sys/netinet6/ip6_ipsec.c	Wed Nov 12 22:58:52 2014	(r274455)
@@ -273,11 +273,7 @@ ip6_ipsec_output(struct mbuf **m, struct
 				/*
 				 * No IPsec processing is needed, free
 				 * reference to SP.
-				 *
-				 * NB: null pointer to avoid free at
-				 *     done: below.
 				 */
-				KEY_FREESP(&sp), sp = NULL;
 				goto done;
 			}
 		}