 @@ -1,14 +1,14 @@
-/*	$NetBSD: rfc6056.c,v 1.7 2012/06/21 10:30:47 yamt Exp $	*/
+/*	$NetBSD: rfc6056.c,v 1.8 2012/06/21 10:35:28 yamt Exp $	*/
 /*
  * Copyright 2011 Vlad Balan
+ *
  * Written by Vlad Balan for the NetBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -24,27 +24,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 /*
  * see:
  *	RFC 6056 Recommendations for Transport-Protocol Port Randomization
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfc6056.c,v 1.7 2012/06/21 10:30:47 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfc6056.c,v 1.8 2012/06/21 10:35:28 yamt Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/kauth.h>
 #include <sys/uidinfo.h>
 #include <sys/domain.h>
 #include <sys/md5.h>
 #include <sys/cprng.h>
 #include <net/if.h>
 #include <net/route.h>
 @@ -349,67 +349,55 @@ check_suitable_port(uint16_t port, struc
+		}
 		break;
+	}
 #endif
 	default:
 		DPRINTF("%s unknown address family\n", __func__);
 		return false;
+	}
 	return false;
+}
 /* This is the default BSD algorithm, as described in RFC 6056 */
 static int
-algo_bsd(int algo, uint16_t *port, struct inpcb_hdr *inp_hdr,
+algo_bsd(int algo, uint16_t *port, struct inpcb_hdr *inp_hdr, kauth_cred_t cred)
 kauth_cred_t cred)
+{
-	uint16_t count, num_ephemeral;
+	uint16_t count;
 	uint16_t mymin, mymax, lastport;
 	uint16_t *next_ephemeral;
 	int error;
 	DPRINTF("%s called\n", __func__);
 	error = pcb_getports(inp_hdr, &lastport, &mymin, &mymax,
 	    &next_ephemeral, algo);
 	if (error)
 		return error;
 	count = mymax - mymin + 1;
 	/* Ephemeral port selection function */
 	num_ephemeral = mymax - mymin + 1;
 	if (*next_ephemeral == 0)
 		*next_ephemeral = mymax;
 	count = num_ephemeral;
 	do {
 		uint16_t myport = *next_ephemeral;
 		if (*next_ephemeral <= mymin)
 			*next_ephemeral = mymax;
 		else
 			(*next_ephemeral)--;
 		if (myport < mymin || mymax < myport)
 			myport = mymax;
 		*next_ephemeral = myport - 1;
 		if (check_suitable_port(myport, inp_hdr, cred)) {
 			*port = myport;
 			DPRINTF("%s returning port %d\n", __func__, *port);
 			return 0;
+		}
 		count--;
 	} while (count > 0);
-	DPRINTF("%s returning EINVAL\n", __func__);
+	DPRINTF("%s returning EAGAIN\n", __func__);
 	return EAGAIN;
 	return EINVAL;
+}
 /*
  * The straightforward algorithm that calls random() in order to
  * compute the increment to the next port number.
  */
 static int
 algo_random_start(int algo, uint16_t *port, struct inpcb_hdr *inp_hdr,
     kauth_cred_t cred)
+{
 	uint16_t count, num_ephemeral;
 	uint16_t mymin, mymax, lastport;
 	uint16_t *next_ephemeral;
 @@ -806,39 +794,38 @@ rfc6056_randport(uint16_t *port, struct
 		DPRINTF("local addr: %s\n", ip6_sprintf(&in6p->in6p_laddr));
 		DPRINTF("local port: %d\n", in6p->in6p_lport);
 		DPRINTF("foreign addr: %s\n", ip6_sprintf(&in6p->in6p_faddr));
 		DPRINTF("foreign port: %d\n", in6p->in6p_fport);
 		break;
+	}
 #endif
 	default:
 		break;
+	}
 	DPRINTF("%s rfc6056algo = %d\n", __func__, algo);
 	error = (*algos[algo].func)(algo, &lport, inp_hdr, cred);
-	if (error == 0)
+	if (error == 0) {
 		*port = lport;
-	else {
+	} else if (error != EAGAIN) {
 		uint16_t lastport, mymin, mymax, *pnext_ephemeral;
 		error = pcb_getports(inp_hdr, &lastport, &mymin,
 		    &mymax, &pnext_ephemeral, algo);
 		if (error)
 			return error;
 		*port = lastport - 1;
+	}
 	return error;
+}
 /* Sets the algorithm to be used globally */
 static int
 rfc6056_algo_name_select(const char *name, int *algo)
+{
 	size_t ai;
 	DPRINTF("%s called\n", __func__);
 	for (ai = 0; ai < NALGOS; ai++)
 		if (strcmp(algos[ai].name, name) == 0) {