Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out some rpc validation code.

This commit is contained in:
dholland 2014-06-10 17:18:18 +00:00
parent 4363781772
commit acc6243e9f
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
usr.sbin/ypbind/ypbind.c
View File

@ -1,4 +1,4 @@
/* $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>
@ -28,7 +28,7 @@
#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>
@ -341,6 +341,28 @@ purge_bindingdir(const char *dirpath)
////////////////////////////////////////////////////////////
// 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
*/
@ -357,15 +379,9 @@ rpc_received(char *dom_name, struct sockaddr_in *raddrp, int force,
DPRINTF("returned from %s about %s\n",
inet_ntoa(raddrp->sin_addr), dom_name);
if (dom_name == NULL)
return;
if (_yp_invalid_domain(dom_name))
return;
/* don't support insecure servers by default */
if (!insecure && ntohs(raddrp->sin_port) >= IPPORT_RESERVED)
if (!rpc_is_valid_response(dom_name, raddrp)) {
return;
}
for (dom = domains; dom != NULL; dom = dom->dom_next)
if (!strcmp(dom->dom_name, dom_name))