From owner-svn-src-all@freebsd.org Thu Jun 1 08:15:35 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 108BDBF084B;
Thu, 1 Jun 2017 08:15:35 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 D47516E16D;
Thu, 1 Jun 2017 08:15:34 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v518FYD6018522;
Thu, 1 Jun 2017 08:15:34 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v518FYqo018521;
Thu, 1 Jun 2017 08:15:34 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201706010815.v518FYqo018521@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tuexen set sender to
tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 1 Jun 2017 08:15:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r319396 - stable/11/sys/netinet
X-SVN-Group: stable-11
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2017 08:15:35 -0000
Author: tuexen
Date: Thu Jun 1 08:15:33 2017
New Revision: 319396
URL: https://svnweb.freebsd.org/changeset/base/319396
Log:
MFC r313032:
Ensure that the variable bail is always initialized before used.
Modified:
stable/11/sys/netinet/sctp_output.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/netinet/sctp_output.c
==============================================================================
--- stable/11/sys/netinet/sctp_output.c Thu Jun 1 08:12:44 2017 (r319395)
+++ stable/11/sys/netinet/sctp_output.c Thu Jun 1 08:15:33 2017 (r319396)
@@ -7730,9 +7730,9 @@ sctp_fill_outqueue(struct sctp_tcb *stcb,
/* must make even word boundary */
space_left &= 0xfffffffc;
strq = stcb->asoc.ss_functions.sctp_ss_select_stream(stcb, net, asoc);
+ giveup = 0;
+ bail = 0;
while ((space_left > 0) && (strq != NULL)) {
- giveup = 0;
- bail = 0;
moved = sctp_move_to_outqueue(stcb, strq, space_left, frag_point,
&giveup, eeor_mode, &bail, so_locked);
stcb->asoc.ss_functions.sctp_ss_scheduled(stcb, net, asoc, strq, moved);