From owner-svn-src-stable-7@FreeBSD.ORG  Thu Feb 12 18:22:11 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E22B1065676;
	Thu, 12 Feb 2009 18:22:11 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BF998FC19;
	Thu, 12 Feb 2009 18:22:11 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1CIMBrt063466;
	Thu, 12 Feb 2009 18:22:11 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1CIMB9s063465;
	Thu, 12 Feb 2009 18:22:11 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200902121822.n1CIMB9s063465@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Thu, 12 Feb 2009 18:22:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188526 - in stable/7/sys: . netinet
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2009 18:22:12 -0000

Author: rrs
Date: Thu Feb 12 18:22:11 2009
New Revision: 188526
URL: http://svn.freebsd.org/changeset/base/188526

Log:
  MFC of 184031:
  
  The flags value was not always being copied out in the recv routine like it
  should be.
  Obtained from:  Michael Tuexen

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/netinet/sctputil.c

Modified: stable/7/sys/netinet/sctputil.c
==============================================================================
--- stable/7/sys/netinet/sctputil.c	Thu Feb 12 18:02:46 2009	(r188525)
+++ stable/7/sys/netinet/sctputil.c	Thu Feb 12 18:22:11 2009	(r188526)
@@ -5896,9 +5896,10 @@ release_unlocked:
 		    (no_rcv_needed == 0))
 			sctp_user_rcvd(stcb, &freed_so_far, hold_rlock, rwnd_req);
 	}
-	if (msg_flags)
-		*msg_flags = out_flags;
 out:
+	if (msg_flags) {
+		*msg_flags = out_flags;
+	}
 	if (((out_flags & MSG_EOR) == 0) &&
 	    ((in_flags & MSG_PEEK) == 0) &&
 	    (sinfo) &&