diff options
author | tuexen <tuexen@FreeBSD.org> | 2014-12-21 13:58:53 +0000 |
---|---|---|
committer | tuexen <tuexen@FreeBSD.org> | 2014-12-21 13:58:53 +0000 |
commit | 03ee3bf248aae0c0b22006cd345a7545b9721255 (patch) | |
tree | 7461929260af2eefad053a522f63f456aa8976d2 /sys/netinet/sctputil.c | |
parent | 1844398e91a74eb6ec71857e107247b184a5fbc5 (diff) | |
download | FreeBSD-src-03ee3bf248aae0c0b22006cd345a7545b9721255.zip FreeBSD-src-03ee3bf248aae0c0b22006cd345a7545b9721255.tar.gz |
Don't check twice that inp is not NULL.
Reported by: Coverity
CID: 748671
MFC after: 3 days
Diffstat (limited to 'sys/netinet/sctputil.c')
-rw-r--r-- | sys/netinet/sctputil.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index d066c74..edf6ae8 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -1949,7 +1949,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, * though we use a different timer. We also add the HB timer * PLUS a random jitter. */ - if ((inp == NULL) || (stcb == NULL) || (net == NULL)) { + if ((stcb == NULL) || (net == NULL)) { return; } else { uint32_t rndval; @@ -2004,9 +2004,6 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, * nothing needed but the endpoint here ususually about 60 * minutes. */ - if (inp == NULL) { - return; - } tmr = &inp->sctp_ep.signature_change; to_ticks = inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_SIGNATURE]; break; @@ -2023,9 +2020,6 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, * timer since that has stopped and we are in the GONE * state. */ - if (inp == NULL) { - return; - } tmr = &inp->sctp_ep.signature_change; to_ticks = MSEC_TO_TICKS(SCTP_INP_KILL_TIMEOUT); break; @@ -2034,10 +2028,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, * Here we use the value found in the EP for PMTU ususually * about 10 minutes. */ - if ((stcb == NULL) || (inp == NULL)) { - return; - } - if (net == NULL) { + if ((stcb == NULL) || (net == NULL)) { return; } if (net->dest_state & SCTP_ADDR_NO_PMTUD) { @@ -2063,7 +2054,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, * Here we use the endpoints shutdown guard timer usually * about 3 minutes. */ - if ((inp == NULL) || (stcb == NULL)) { + if (stcb == NULL) { return; } to_ticks = inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_MAXSHUTDOWN]; |