svn commit: r364625 - stable/12/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Mon Aug 24 08:33:33 UTC 2020
Author: tuexen
Date: Mon Aug 24 08:33:32 2020
New Revision: 364625
URL: https://svnweb.freebsd.org/changeset/base/364625
Log:
MFC r362720:
Don't check ch for not being NULL, since that is true.
Modified:
stable/12/sys/netinet/sctp_input.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netinet/sctp_input.c
==============================================================================
--- stable/12/sys/netinet/sctp_input.c Mon Aug 24 08:32:16 2020 (r364624)
+++ stable/12/sys/netinet/sctp_input.c Mon Aug 24 08:33:32 2020 (r364625)
@@ -5106,7 +5106,7 @@ process_control_chunks:
break;
case SCTP_STREAM_RESET:
SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_STREAM_RESET\n");
- if (((stcb == NULL) || (ch == NULL) || (chk_length < sizeof(struct sctp_stream_reset_tsn_req)))) {
+ if ((stcb == NULL) || (chk_length < sizeof(struct sctp_stream_reset_tsn_req))) {
/* Its not ours */
*offset = length;
return (stcb);
@@ -5129,7 +5129,7 @@ process_control_chunks:
return (stcb);
}
- if ((ch != NULL) && (stcb != NULL) && (netp != NULL) && (*netp != NULL)) {
+ if ((stcb != NULL) && (netp != NULL) && (*netp != NULL)) {
if (stcb->asoc.pktdrop_supported == 0) {
goto unknown_chunk;
}
@@ -5165,8 +5165,7 @@ process_control_chunks:
goto next_chunk;
}
got_auth = 1;
- if ((ch == NULL) || sctp_handle_auth(stcb, (struct sctp_auth_chunk *)ch,
- m, *offset)) {
+ if (sctp_handle_auth(stcb, (struct sctp_auth_chunk *)ch, m, *offset)) {
/* auth HMAC failed so dump the packet */
*offset = length;
return (stcb);
More information about the svn-src-stable-12
mailing list