d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't check ch for not being NULL, since that is true.

Browse Source 
MFC after:		1 week
This commit is contained in:
Michael Tuexen 2020-06-28 11:12:03 +00:00
parent 62cfcf62f6
commit f2f66ef6d2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=362720
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet/sctp_input.c
View File

@ -5106,7 +5106,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
break; break;
case SCTP_STREAM_RESET: case SCTP_STREAM_RESET:
SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_STREAM_RESET\n"); 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 */ /* Its not ours */
*offset = length; *offset = length;
return (stcb); return (stcb);
@ -5129,7 +5129,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
return (stcb); return (stcb);
} }
if ((ch != NULL) && (stcb != NULL) && (netp != NULL) && (*netp != NULL)) { if ((stcb != NULL) && (netp != NULL) && (*netp != NULL)) {
if (stcb->asoc.pktdrop_supported == 0) { if (stcb->asoc.pktdrop_supported == 0) {
goto unknown_chunk; goto unknown_chunk;
} }
@ -5165,8 +5165,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
goto next_chunk; goto next_chunk;
} }
got_auth = 1; got_auth = 1;
if ((ch == NULL) || sctp_handle_auth(stcb, (struct sctp_auth_chunk *)ch, if (sctp_handle_auth(stcb, (struct sctp_auth_chunk *)ch, m, *offset)) {
m, *offset)) {
/* auth HMAC failed so dump the packet */ /* auth HMAC failed so dump the packet */
*offset = length; *offset = length;
return (stcb); return (stcb);