svn commit: r188526 - in stable/7/sys: . netinet

[Randall Stewart]

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) &&