svn commit: r283697 - stable/10/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Fri May 29 11:01:46 2015
New Revision: 283697
URL: https://svnweb.freebsd.org/changeset/base/283697

Log:
  MFC r273634:
  
  Fix a use of an uninitialized variable by makeing sure
  that sctp_med_chunk_output() always initialized the reason_code
  instead of relying on the caller.
  The variable is only used for debugging purpose.
  This issue was reported by Peter Bostroem from Google.

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 10:24:16 2015	(r283696)
+++ stable/10/sys/netinet/sctp_output.c	Fri May 29 11:01:46 2015	(r283697)
@@ -6734,7 +6734,7 @@ sctp_sendall_iterator(struct sctp_inpcb 
 	if (do_chunk_output)
 		sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_USR_SEND, SCTP_SO_NOT_LOCKED);
 	else if (added_control) {
-		int num_out = 0, reason = 0, now_filled = 0;
+		int num_out, reason, now_filled = 0;
 		struct timeval now;
 		int frag_point;
 
@@ -7800,6 +7800,7 @@ sctp_med_chunk_output(struct sctp_inpcb 
 	int quit_now = 0;
 
 	*num_out = 0;
+	*reason_code = 0;
 	auth_keyid = stcb->asoc.authinfo.active_keyid;
 	if ((asoc->state & SCTP_STATE_SHUTDOWN_PENDING) ||
 	    (asoc->state & SCTP_STATE_SHUTDOWN_RECEIVED) ||
@@ -9931,7 +9932,7 @@ sctp_chunk_output(struct sctp_inpcb *inp
 	 */
 	struct sctp_association *asoc;
 	struct sctp_nets *net;
-	int error = 0, num_out = 0, tot_out = 0, ret = 0, reason_code = 0;
+	int error = 0, num_out, tot_out = 0, ret = 0, reason_code;
 	unsigned int burst_cnt = 0;
 	struct timeval now;
 	int now_filled = 0;