Author: tuexen
Date: Fri May 29 12:45:55 2015
New Revision: 283721
URL: https://svnweb.freebsd.org/changeset/base/283721
Log:
MFC r277424:
Remove comparisons which are not necessary.
With manual intervention.
Reported by: Coverity
CID: 1237826, 1237844, 1237847
Modified:
stable/10/sys/netinet/sctp_sysctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_sysctl.c
==============================================================================
--- stable/10/sys/netinet/sctp_sysctl.c Fri May 29 12:35:21 2015
(r283720)
+++ stable/10/sys/netinet/sctp_sysctl.c Fri May 29 12:45:55 2015
(r283721)
@@ -569,8 +569,12 @@ sctp_sysctl_handle_udp_tunneling(SYSCTL_
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_A
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
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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
