From owner-svn-src-all@FreeBSD.ORG Fri May 29 12:33:03 2015
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])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 2B05C371;
Fri, 29 May 2015 12:33:03 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
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 18C5C1134;
Fri, 29 May 2015 12:33:03 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4TCX2vJ032525;
Fri, 29 May 2015 12:33:02 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4TCX2UP032524;
Fri, 29 May 2015 12:33:02 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201505291233.t4TCX2UP032524@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tuexen set sender to
tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Fri, 29 May 2015 12:33:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r283719 - stable/10/sys/netinet
X-SVN-Group: stable-10
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.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <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: Fri, 29 May 2015 12:33:03 -0000
Author: tuexen
Date: Fri May 29 12:33:02 2015
New Revision: 283719
URL: https://svnweb.freebsd.org/changeset/base/283719
Log:
MFC r277350:
Fix a bug which only shows up when an mbuf allocation failed.
Therefore chances are low that we hit this.
Reported by: Coverity
CID: 1018886
Modified:
stable/10/sys/netinet/sctp_output.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_output.c
==============================================================================
--- stable/10/sys/netinet/sctp_output.c Fri May 29 12:30:19 2015 (r283718)
+++ stable/10/sys/netinet/sctp_output.c Fri May 29 12:33:02 2015 (r283719)
@@ -7420,7 +7420,7 @@ dont_do_it:
SCTP_TCB_SEND_LOCK(stcb);
send_lock_up = 1;
}
- if (chk->data == NULL) {
+ if (sp->data == NULL) {
/* unsteal the data */
sp->data = chk->data;
sp->tail_mbuf = chk->last_mbuf;