diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-05-29 12:45:55 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-05-29 12:45:55 +0000 |
| commit | 03ab9820fcf557a71c964388e71720c2a8846c4e (patch) | |
| tree | 40ed026f94192d7061dc85e8a43c33bfc32d64c6 /sys/netinet/sctp_sysctl.c | |
| parent | 4ed8a22fc6e9d9709d34f257c125c3a9ceac5e3c (diff) | |
| download | FreeBSD-src-03ab9820fcf557a71c964388e71720c2a8846c4e.zip FreeBSD-src-03ab9820fcf557a71c964388e71720c2a8846c4e.tar.gz | |
MFC r277424:
Remove comparisons which are not necessary.
With manual intervention.
Reported by: Coverity
CID: 1237826, 1237844, 1237847
Diffstat (limited to 'sys/netinet/sctp_sysctl.c')
| -rw-r--r-- | sys/netinet/sctp_sysctl.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 4058e81..2a69141 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -569,8 +569,12 @@ sctp_sysctl_handle_udp_tunneling(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if ((error == 0) && (req->newptr != NULL)) { +#if (SCTPCTL_UDP_TUNNELING_PORT_MIN == 0) + if (new > SCTPCTL_UDP_TUNNELING_PORT_MAX) { +#else if ((new < SCTPCTL_UDP_TUNNELING_PORT_MIN) || (new > SCTPCTL_UDP_TUNNELING_PORT_MAX)) { +#endif error = EINVAL; } else { SCTP_INP_INFO_WLOCK(); @@ -598,9 +602,14 @@ sctp_sysctl_handle_auth(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if ((error == 0) && (req->newptr != NULL)) { +#if (SCTPCTL_AUTH_DISABLE_MIN ==0) + if ((new > SCTPCTL_AUTH_DISABLE_MAX) || + ((new == 1) && (SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1))) { +#else if ((new < SCTPCTL_AUTH_DISABLE_MIN) || (new > SCTPCTL_AUTH_DISABLE_MAX) || ((new == 1) && (SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1))) { +#endif error = EINVAL; } else { SCTP_BASE_SYSCTL(sctp_auth_disable) = new; @@ -619,9 +628,14 @@ sctp_sysctl_handle_asconf(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if ((error == 0) && (req->newptr != NULL)) { +#if (SCTPCTL_ASCONF_ENABLE_MIN == 0) + if ((new > SCTPCTL_ASCONF_ENABLE_MAX) || + ((new == 1) && (SCTP_BASE_SYSCTL(sctp_auth_disable) == 1))) { +#else if ((new < SCTPCTL_ASCONF_ENABLE_MIN) || (new > SCTPCTL_ASCONF_ENABLE_MAX) || ((new == 1) && (SCTP_BASE_SYSCTL(sctp_auth_disable) == 1))) { +#endif error = EINVAL; } else { SCTP_BASE_SYSCTL(sctp_asconf_enable) = new; |
