Tue Jun 10 17:18:18 2014 UTC ()

Factor out some rpc validation code.


(dholland)

diff -r1.91 -r1.92 src/usr.sbin/ypbind/ypbind.c

--- src/usr.sbin/ypbind/ypbind.c 2014/06/10 17:18:02	1.91
+++ src/usr.sbin/ypbind/ypbind.c 2014/06/10 17:18:18	1.92

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ypbind.c,v 1.91 2014/06/10 17:18:02 dholland Exp $	*/
+/*	$NetBSD: ypbind.c,v 1.92 2014/06/10 17:18:18 dholland Exp $	*/
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
  * All rights reserved.
+ *
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.91 2014/06/10 17:18:02 dholland Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.92 2014/06/10 17:18:18 dholland Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/syslog.h>
 #include <sys/uio.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 @@ -332,50 +332,66 @@ purge_bindingdir(const char *dirpath)
 		if (unlinkedfiles)
 			rewinddir(dirp);
 	} while (unlinkedfiles);
 	closedir(dirp);
 	return(0);
+}
 ////////////////////////////////////////////////////////////
 // sunrpc twaddle
 /*
  * Check if the info coming in is (at least somewhat) valid.
  */
 static int
 rpc_is_valid_response(char *name, struct sockaddr_in *addr)
+{
 	if (name == NULL) {
 		return 0;
+	}
 	if (_yp_invalid_domain(name)) {
 		return 0;
+	}
 	/* don't support insecure servers by default */
 	if (!insecure && ntohs(addr->sin_port) >= IPPORT_RESERVED) {
 		return 0;
+	}
 	return 1;
+}
 /*
  * LOOPBACK IS MORE IMPORTANT: PUT IN HACK
  */
 static void
 rpc_received(char *dom_name, struct sockaddr_in *raddrp, int force,
 	     int is_ypset)
+{
 	struct domain *dom;
 	struct iovec iov[2];
 	struct ypbind_resp ybr;
 	ssize_t result;
 	int fd;
 	DPRINTF("returned from %s about %s\n",
 		inet_ntoa(raddrp->sin_addr), dom_name);
-	if (dom_name == NULL)
+	if (!rpc_is_valid_response(dom_name, raddrp)) {
 		return;
 	if (_yp_invalid_domain(dom_name))
 		return;
 		/* don't support insecure servers by default */
 	if (!insecure && ntohs(raddrp->sin_port) >= IPPORT_RESERVED)
 		return;
+	}
 	for (dom = domains; dom != NULL; dom = dom->dom_next)
 		if (!strcmp(dom->dom_name, dom_name))
 			break;
 	if (dom == NULL) {
 		if (force == 0)
 			return;
 		dom = domain_create(dom_name);
+	}
 	if (is_ypset) {
 		dom->dom_been_ypset = 1;