svn commit: r368175 - stable/12/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Mon Nov 30 09:14:01 2020
New Revision: 368175
URL: https://svnweb.freebsd.org/changeset/base/368175

Log:
  MFC r366483:
  
  Ensure variables are initialized before used.

Modified:
  stable/12/sys/netinet/sctp_input.c
  stable/12/sys/netinet/sctp_pcb.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/sctp_input.c
==============================================================================
--- stable/12/sys/netinet/sctp_input.c	Mon Nov 30 09:12:45 2020	(r368174)
+++ stable/12/sys/netinet/sctp_input.c	Mon Nov 30 09:14:01 2020	(r368175)
@@ -5570,7 +5570,9 @@ sctp_common_input_processing(struct mbuf **mm, int iph
 			stcb = NULL;
 			goto out;
 		}
-		data_processed = 1;
+		if (retval == 0) {
+			data_processed = 1;
+		}
 		/*
 		 * Anything important needs to have been m_copy'ed in
 		 * process_data

Modified: stable/12/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/12/sys/netinet/sctp_pcb.c	Mon Nov 30 09:12:45 2020	(r368174)
+++ stable/12/sys/netinet/sctp_pcb.c	Mon Nov 30 09:14:01 2020	(r368175)
@@ -6113,6 +6113,7 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, s
 	peer_supports_prsctp = 0;
 	peer_supports_auth = 0;
 	peer_supports_asconf = 0;
+	peer_supports_asconf_ack = 0;
 	peer_supports_reconfig = 0;
 	peer_supports_nrsack = 0;
 	peer_supports_pktdrop = 0;