Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Oct 2014 09:25:30 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r273634 - head/sys/netinet
Message-ID:  <201410250925.s9P9PULY095273@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Sat Oct 25 09:25:29 2014
New Revision: 273634
URL: https://svnweb.freebsd.org/changeset/base/273634

Log:
  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.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp_output.c

Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c	Sat Oct 25 07:20:46 2014	(r273633)
+++ head/sys/netinet/sctp_output.c	Sat Oct 25 09:25:29 2014	(r273634)
@@ -6748,7 +6748,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;
 
@@ -7814,6 +7814,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) ||
@@ -9945,7 +9946,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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410250925.s9P9PULY095273>