From owner-svn-src-all@FreeBSD.ORG  Tue Jul 16 16:37:09 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 17832EA3;
 Tue, 16 Jul 2013 16:37:09 +0000 (UTC)
 (envelope-from andre@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 0AA64289;
 Tue, 16 Jul 2013 16:37:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6GGb8kV011196;
 Tue, 16 Jul 2013 16:37:08 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6GGb8kb011195;
 Tue, 16 Jul 2013 16:37:08 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201307161637.r6GGb8kb011195@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Tue, 16 Jul 2013 16:37:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253395 - head/sys/netinet
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: Tue, 16 Jul 2013 16:37:09 -0000

Author: andre
Date: Tue Jul 16 16:37:08 2013
New Revision: 253395
URL: http://svnweb.freebsd.org/changeset/base/253395

Log:
  Free the non-fatal "timestamp missing" debug string manually as it is
  not covered by the catch-all free for the error cases.
  
  Found by:	Coverity

Modified:
  head/sys/netinet/tcp_syncache.c

Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c	Tue Jul 16 15:51:32 2013	(r253394)
+++ head/sys/netinet/tcp_syncache.c	Tue Jul 16 16:37:08 2013	(r253395)
@@ -1041,9 +1041,12 @@ syncache_expand(struct in_conninfo *inc,
 	 * reports of non-compliants stacks.
 	 */
 	if ((sc->sc_flags & SCF_TIMESTAMP) && !(to->to_flags & TOF_TS)) {
-		if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
+		if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
 			log(LOG_DEBUG, "%s; %s: Timestamp missing, "
 			    "no action\n", s, __func__);
+			free(s, M_TCPLOG);
+			s = NULL;
+		}
 	}
 
 	/*