[Midnightbsd-cvs] src [8194] trunk/sys/kern/uipc_socket.c: remove redundant call to pr_ctloutput from code that handles SO_SETFIB

[laffer1 at midnightbsd.org]

Revision: 8194
          http://svnweb.midnightbsd.org/src/?rev=8194
Author:   laffer1
Date:     2016-09-17 11:42:11 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
remove redundant call to pr_ctloutput from code that handles SO_SETFIB

Modified Paths:
--------------
    trunk/sys/kern/uipc_socket.c

Modified: trunk/sys/kern/uipc_socket.c
===================================================================
--- trunk/sys/kern/uipc_socket.c	2016-09-17 15:41:20 UTC (rev 8193)
+++ trunk/sys/kern/uipc_socket.c	2016-09-17 15:42:11 UTC (rev 8194)
@@ -2498,6 +2498,9 @@
 		case SO_SETFIB:
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 					    sizeof optval);
+			if (error)
+				goto bad;
+
 			if (optval < 0 || optval >= rt_numfibs) {
 				error = EINVAL;
 				goto bad;
@@ -2504,14 +2507,10 @@
 			}
 			if (((so->so_proto->pr_domain->dom_family == PF_INET) ||
 			   (so->so_proto->pr_domain->dom_family == PF_INET6) ||
-			   (so->so_proto->pr_domain->dom_family == PF_ROUTE))) {
+			   (so->so_proto->pr_domain->dom_family == PF_ROUTE)))
 				so->so_fibnum = optval;
-				/* Note: ignore error */
-				if (so->so_proto->pr_ctloutput)
-					(*so->so_proto->pr_ctloutput)(so, sopt);
-			} else {
+			else
 				so->so_fibnum = 0;
-			}
 			break;
 
 		case SO_USER_COOKIE: