Fixed memory leaks (bz 1448128)

Signed-off-by: Steve Dickson <steved@redhat.com>
2017-05-11 12:05:09 -04:00 · 2017-05-11 12:05:09 -04:00 · 57c833e131
commit 57c833e131
parent 283abcbc02
5 changed files with 190 additions and 696 deletions
--- a/rpcbind-0.2.4-rc1.patch
+++ b/rpcbind-0.2.4-rc1.patch
@ -1,193 +0,0 @@
 diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
 index ff9ce6b..148fe42 100644
 --- a/src/rpcb_svc_com.c
 +++ b/src/rpcb_svc_com.c
@@ -536,10 +536,6 @@ create_rmtcall_fd(struct netconfig *nconf)
 		rmttail->next = rmt;
 		rmttail = rmt;
 	}
 -	/* XXX not threadsafe */
 -	if (fd > svc_maxfd)
 -		svc_maxfd = fd;
 -	FD_SET(fd, &svc_fdset);
 	return (fd);
 }
@@ -1056,9 +1052,6 @@ free_slot_by_index(int index)
 	fi = &FINFO[index];
 	if (fi->flag & FINFO_ACTIVE) {
 		netbuffree(fi->caller_addr);
 -		/* XXX may be too big, but can't access xprt array here */
 -		if (fi->forward_fd >= svc_maxfd)
 -			svc_maxfd--;
 		free(fi->uaddr);
 		fi->flag &= ~FINFO_ACTIVE;
 		rpcb_rmtcalls--;
@@ -1097,35 +1090,28 @@ netbuffree(struct netbuf *ap)
 }
 -#define	MASKVAL	(POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)
 -extern bool_t __svc_clean_idle(fd_set *, int, bool_t);
 -
 void
 my_svc_run()
 {
 -	size_t nfds;
 -	struct pollfd pollfds[FD_SETSIZE];
 	int poll_ret, check_ret;
 	int n;
 -#ifdef SVC_RUN_DEBUG
 -	int i;
 -#endif
 -	register struct pollfd	*p;
 -	fd_set cleanfds;
 	for (;;) {
 -		p = pollfds;
 -		for (n = 0; n <= svc_maxfd; n++) {
 -			if (FD_ISSET(n, &svc_fdset)) {
 -				p->fd = n;
 -				p->events = MASKVAL;
 -				p++;
 -			}
 -		}
 -		nfds = p - pollfds;
 -		poll_ret = 0;
 +	        struct pollfd my_pollfd[svc_max_pollfd];
 +		int i;
 +
 +		if (svc_max_pollfd == 0 && svc_pollfd == NULL)
 +		  return;
 -		switch (poll_ret = poll(pollfds, nfds, 30 * 1000)) {
 +
 +		for (i = 0; i < svc_max_pollfd; ++i)
 +		  {
 +		    my_pollfd[i].fd = svc_pollfd[i].fd;
 +		    my_pollfd[i].events = svc_pollfd[i].events;
 +		    my_pollfd[i].revents = 0;
 +		  }
 +
 +		switch (poll_ret = poll(my_pollfd, svc_max_pollfd, 30 * 1000)) {
 		case -1:
 			/*
 			 * We ignore all errors, continuing with the assumption
@@ -1133,8 +1119,6 @@ my_svc_run()
 			 * other outside event) and not caused by poll().
 			 */
 		case 0:
 -			cleanfds = svc_fdset;
 -			__svc_clean_idle(&cleanfds, 30, FALSE);
 			continue;
 		default:
 			/*
@@ -1144,10 +1128,10 @@ my_svc_run()
 			 * don't call svc_getreq_poll.  Otherwise, there
 			 * must be another so we must call svc_getreq_poll.
 			 */
 -			if ((check_ret = check_rmtcalls(pollfds, nfds)) ==
 +			if ((check_ret = check_rmtcalls(my_pollfd, svc_max_pollfd)) ==
 			    poll_ret)
 				continue;
 -			svc_getreq_poll(pollfds, poll_ret-check_ret);
 +			svc_getreq_poll(my_pollfd, poll_ret-check_ret);
 		}
 	}
 }
@@ -1183,12 +1167,33 @@ check_rmtcalls(struct pollfd *pfds, int nfds)
 	return (ncallbacks_found);
 }
 +/*
 + * This is really a helper function defined in libtirpc, 
 + * but unfortunately, it hasn't been exported yet.
 + */
 +static struct netbuf *
 +__rpc_set_netbuf(struct netbuf *nb, const void *ptr, size_t len)
 +{
 +	if (nb->len != len) {
 +		if (nb->len)
 +			mem_free(nb->buf, nb->len);
 +		nb->buf = mem_alloc(len);
 +		if (nb->buf == NULL)
 +			return NULL;
 +
 +		nb->maxlen = nb->len = len;
 +	}
 +	memcpy(nb->buf, ptr, len);
 +	return nb;
 +}
 +
 static void
 xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
 {
 +	const struct netbuf *caller = fi->caller_addr;
 	u_int32_t *xidp;
 -	*(svc_getrpccaller(xprt)) = *(fi->caller_addr);
 +	__rpc_set_netbuf(svc_getrpccaller(xprt), caller->buf, caller->len);
 	xidp = __rpcb_get_dg_xidp(xprt);
 	*xidp = fi->caller_xid;
 }
@@ -1274,10 +1279,17 @@ handle_reply(int fd, SVCXPRT *xprt)
 	a.rmt_localvers = fi->versnum;
 	xprt_set_caller(xprt, fi);
 +#if defined(SVC_XP_AUTH)
 +	SVC_XP_AUTH(xprt) = svc_auth_none;
 +#else 
 	xprt->xp_auth = &svc_auth_none;
 +#endif
 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
 +#if !defined(SVC_XP_AUTH)
 	SVCAUTH_DESTROY(xprt->xp_auth);
 	xprt->xp_auth = NULL;
 +#endif
 +
 done:
 	if (buffer)
 		free(buffer);
 diff --git a/src/rpcbind.c b/src/rpcbind.c
 index 045daa1..c4265cd 100644
 --- a/src/rpcbind.c
 +++ b/src/rpcbind.c
@@ -87,6 +87,7 @@ static inline void __nss_configure_lookup(const char *db, const char *s) {}
 int debugging = 0;	/* Tell me what's going on */
 int doabort = 0;	/* When debugging, do an abort on errors */
 int dofork = 1;		/* fork? */
 +int createdsocket = 0;  /* Did I create the socket or systemd did it for me? */
 rpcblist_ptr list_rbl;	/* A list of version 3/4 rpcbind services */
@@ -445,6 +446,7 @@ init_transport(struct netconfig *nconf)
 		memset(&sun, 0, sizeof sun);
 		sun.sun_family = AF_LOCAL;
 		unlink(_PATH_RPCBINDSOCK);
 +		createdsocket = 1; /* We are now in the process of creating the unix socket */
 		strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
 		addrlen = SUN_LEN(&sun);
 		sa = (struct sockaddr *)&sun;
@@ -846,7 +848,8 @@ static void
 terminate(int dummy /*__unused*/)
 {
 	close(rpcbindlockfd);
 -	unlink(_PATH_RPCBINDSOCK);
 +	if(createdsocket)
 +		unlink(_PATH_RPCBINDSOCK);
 	unlink(RPCBINDDLOCK);
 #ifdef WARMSTART
 	write_warmstart();	/* Dump yourself */
 diff --git a/src/security.c b/src/security.c
 index 0c9453f..c54ce26 100644
 --- a/src/security.c
 +++ b/src/security.c
@@ -17,6 +17,8 @@
 #include <syslog.h>
 #include <netdb.h>
 +#include "xlog.h"
 +
 /*
  * XXX for special case checks in check_callit.
  */
--- a/rpcbind-0.2.4-rc2.patch
+++ b/rpcbind-0.2.4-rc2.patch
@ -1,474 +0,0 @@
 diff --git a/.gitignore b/.gitignore
 index 321dff6..a8f1fed 100644
 --- a/.gitignore
 +++ b/.gitignore
@@ -27,3 +27,4 @@ rpcbind
 rpcinfo
 # cscope database files
 cscope.*
 +systemd/rpcbind.service
 diff --git a/Makefile.am b/Makefile.am
 index 5ec8cd6..43c2710 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -50,6 +50,10 @@ if SYSTEMD
 AM_CPPFLAGS += $(SYSTEMD_CFLAGS) -DSYSTEMD
 rpcbind_LDADD += $(SYSTEMD_LIBS)
 +
 +systemdsystemunit_DATA = \
 +	systemd/rpcbind.service \
 +	systemd/rpcbind.socket
 endif
 rpcinfo_SOURCES =       src/rpcinfo.c
 diff --git a/configure.ac b/configure.ac
 index af4b74b..f84921e 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -61,4 +61,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
 AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
 -AC_OUTPUT([Makefile])
 +# make sbindir available for substitution in config file
 +# 2 "evals" needed to expand variable names
 +AC_SUBST([_sbindir])
 +AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
 +
 +AC_OUTPUT([Makefile systemd/rpcbind.service])
 diff --git a/src/check_bound.c b/src/check_bound.c
 index c70b845..92bfd36 100644
 --- a/src/check_bound.c
 +++ b/src/check_bound.c
@@ -70,7 +70,7 @@ static struct fdlist *fdhead;	/* Link list of the check fd's */
 static struct fdlist *fdtail;
 static char *nullstring = "";
 -static bool_t check_bound __P((struct fdlist *, char *uaddr));
 +static bool_t check_bound(struct fdlist *, char *uaddr);
 /*
  * Returns 1 if the given address is bound for the given addr & transport
 diff --git a/src/pmap_svc.c b/src/pmap_svc.c
 index ad28b93..4c744fe 100644
 --- a/src/pmap_svc.c
 +++ b/src/pmap_svc.c
@@ -60,11 +60,11 @@ static	char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
 #include "rpcbind.h"
 #include "xlog.h"
 #include <rpc/svc_soc.h> /* svc_getcaller routine definition */
 -static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
 -					       rpcprot_t));
 -static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long));
 -static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *));
 -static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *));
 +static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t,
 +					       rpcprot_t);
 +static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long);
 +static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *);
 +static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *);
 /*
  * Called for all the version 2 inquiries.
 diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
 index bd92201..709e3fb 100644
 --- a/src/rpcb_svc.c
 +++ b/src/rpcb_svc.c
@@ -53,10 +53,10 @@
 #include "rpcbind.h"
 #include "xlog.h"
 -static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
 -					   rpcvers_t));
 -static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *,
 -					rpcvers_t));
 +static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *,
 +					   rpcvers_t);
 +static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *,
 +					rpcvers_t);
 /*
  * Called by svc_getreqset. There is a separate server handle for
@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
 	} argument;
 	char *result;
 	xdrproc_t xdr_argument, xdr_result;
 -	void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
 +	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
 	rpcprog_t setprog = 0;
 	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
 diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
 index b673452..5094879 100644
 --- a/src/rpcb_svc_4.c
 +++ b/src/rpcb_svc_4.c
@@ -54,13 +54,11 @@
 #include "rpcbind.h"
 #include "xlog.h"
 -static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
 -				      rpcvers_t));
 -static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
 -static void *rpcbproc_getaddrlist_4_local
 -	__P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
 -static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *));
 -static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
 +static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
 +static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
 +static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
 +static void free_rpcb_entry_list(rpcb_entry_list_ptr *);
 +static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
 /*
  * Called by svc_getreqset. There is a separate server handle for
@@ -78,7 +76,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
 	} argument;
 	char *result;
 	xdrproc_t xdr_argument, xdr_result;
 -	void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
 +	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
 	rpcprog_t setprog = 0;
 	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
 diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
 index ff9ce6b..5862c26 100644
 --- a/src/rpcb_svc_com.c
 +++ b/src/rpcb_svc_com.c
@@ -100,29 +100,29 @@ struct finfo {
 static struct finfo     FINFO[NFORWARD];
 -static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *));
 -static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *));
 -static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *));
 -static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *));
 -static int find_rmtcallfd_by_netid __P((char *));
 -static SVCXPRT *find_rmtcallxprt_by_fd __P((int));
 -static int forward_register __P((u_int32_t, struct netbuf *, int, char *,
 -    rpcproc_t, rpcvers_t, u_int32_t *));
 -static struct finfo *forward_find __P((u_int32_t));
 -static int free_slot_by_xid __P((u_int32_t));
 -static int free_slot_by_index __P((int));
 -static int netbufcmp __P((struct netbuf *, struct netbuf *));
 -static struct netbuf *netbufdup __P((struct netbuf *));
 -static void netbuffree __P((struct netbuf *));
 -static int check_rmtcalls __P((struct pollfd *, int));
 -static void xprt_set_caller __P((SVCXPRT *, struct finfo *));
 -static void send_svcsyserr __P((SVCXPRT *, struct finfo *));
 -static void handle_reply __P((int, SVCXPRT *));
 -static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *));
 -static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *));
 -static char *getowner __P((SVCXPRT *, char *, size_t));
 -static int add_pmaplist __P((RPCB *));
 -static int del_pmaplist __P((RPCB *));
 +static bool_t xdr_encap_parms(XDR *, struct encap_parms *);
 +static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *);
 +static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *);
 +static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *);
 +static int find_rmtcallfd_by_netid(char *);
 +static SVCXPRT *find_rmtcallxprt_by_fd(int);
 +static int forward_register(u_int32_t, struct netbuf *, int, char *,
 +    rpcproc_t, rpcvers_t, u_int32_t *);
 +static struct finfo *forward_find(u_int32_t);
 +static int free_slot_by_xid(u_int32_t);
 +static int free_slot_by_index(int);
 +static int netbufcmp(struct netbuf *, struct netbuf *);
 +static struct netbuf *netbufdup(struct netbuf *);
 +static void netbuffree(struct netbuf *);
 +static int check_rmtcalls(struct pollfd *, int);
 +static void xprt_set_caller(SVCXPRT *, struct finfo *);
 +static void send_svcsyserr(SVCXPRT *, struct finfo *);
 +static void handle_reply(int, SVCXPRT *);
 +static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
 +static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *);
 +static char *getowner(SVCXPRT *, char *, size_t);
 +static int add_pmaplist(RPCB *);
 +static int del_pmaplist(RPCB *);
 /*
  * Set a mapping of program, version, netid
@@ -536,10 +536,6 @@ create_rmtcall_fd(struct netconfig *nconf)
 		rmttail->next = rmt;
 		rmttail = rmt;
 	}
 -	/* XXX not threadsafe */
 -	if (fd > svc_maxfd)
 -		svc_maxfd = fd;
 -	FD_SET(fd, &svc_fdset);
 	return (fd);
 }
@@ -1056,9 +1052,6 @@ free_slot_by_index(int index)
 	fi = &FINFO[index];
 	if (fi->flag & FINFO_ACTIVE) {
 		netbuffree(fi->caller_addr);
 -		/* XXX may be too big, but can't access xprt array here */
 -		if (fi->forward_fd >= svc_maxfd)
 -			svc_maxfd--;
 		free(fi->uaddr);
 		fi->flag &= ~FINFO_ACTIVE;
 		rpcb_rmtcalls--;
@@ -1097,35 +1090,28 @@ netbuffree(struct netbuf *ap)
 }
 -#define	MASKVAL	(POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)
 -extern bool_t __svc_clean_idle(fd_set *, int, bool_t);
 -
 void
 my_svc_run()
 {
 -	size_t nfds;
 -	struct pollfd pollfds[FD_SETSIZE];
 	int poll_ret, check_ret;
 	int n;
 -#ifdef SVC_RUN_DEBUG
 -	int i;
 -#endif
 -	register struct pollfd	*p;
 -	fd_set cleanfds;
 	for (;;) {
 -		p = pollfds;
 -		for (n = 0; n <= svc_maxfd; n++) {
 -			if (FD_ISSET(n, &svc_fdset)) {
 -				p->fd = n;
 -				p->events = MASKVAL;
 -				p++;
 -			}
 -		}
 -		nfds = p - pollfds;
 -		poll_ret = 0;
 +	        struct pollfd my_pollfd[svc_max_pollfd];
 +		int i;
 +
 +		if (svc_max_pollfd == 0 && svc_pollfd == NULL)
 +		  return;
 -		switch (poll_ret = poll(pollfds, nfds, 30 * 1000)) {
 +
 +		for (i = 0; i < svc_max_pollfd; ++i)
 +		  {
 +		    my_pollfd[i].fd = svc_pollfd[i].fd;
 +		    my_pollfd[i].events = svc_pollfd[i].events;
 +		    my_pollfd[i].revents = 0;
 +		  }
 +
 +		switch (poll_ret = poll(my_pollfd, svc_max_pollfd, 30 * 1000)) {
 		case -1:
 			/*
 			 * We ignore all errors, continuing with the assumption
@@ -1133,8 +1119,6 @@ my_svc_run()
 			 * other outside event) and not caused by poll().
 			 */
 		case 0:
 -			cleanfds = svc_fdset;
 -			__svc_clean_idle(&cleanfds, 30, FALSE);
 			continue;
 		default:
 			/*
@@ -1144,10 +1128,10 @@ my_svc_run()
 			 * don't call svc_getreq_poll.  Otherwise, there
 			 * must be another so we must call svc_getreq_poll.
 			 */
 -			if ((check_ret = check_rmtcalls(pollfds, nfds)) ==
 +			if ((check_ret = check_rmtcalls(my_pollfd, svc_max_pollfd)) ==
 			    poll_ret)
 				continue;
 -			svc_getreq_poll(pollfds, poll_ret-check_ret);
 +			svc_getreq_poll(my_pollfd, poll_ret-check_ret);
 		}
 	}
 }
@@ -1183,12 +1167,33 @@ check_rmtcalls(struct pollfd *pfds, int nfds)
 	return (ncallbacks_found);
 }
 +/*
 + * This is really a helper function defined in libtirpc, 
 + * but unfortunately, it hasn't been exported yet.
 + */
 +static struct netbuf *
 +__rpc_set_netbuf(struct netbuf *nb, const void *ptr, size_t len)
 +{
 +	if (nb->len != len) {
 +		if (nb->len)
 +			mem_free(nb->buf, nb->len);
 +		nb->buf = mem_alloc(len);
 +		if (nb->buf == NULL)
 +			return NULL;
 +
 +		nb->maxlen = nb->len = len;
 +	}
 +	memcpy(nb->buf, ptr, len);
 +	return nb;
 +}
 +
 static void
 xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
 {
 +	const struct netbuf *caller = fi->caller_addr;
 	u_int32_t *xidp;
 -	*(svc_getrpccaller(xprt)) = *(fi->caller_addr);
 +	__rpc_set_netbuf(svc_getrpccaller(xprt), caller->buf, caller->len);
 	xidp = __rpcb_get_dg_xidp(xprt);
 	*xidp = fi->caller_xid;
 }
@@ -1274,10 +1279,17 @@ handle_reply(int fd, SVCXPRT *xprt)
 	a.rmt_localvers = fi->versnum;
 	xprt_set_caller(xprt, fi);
 +#if defined(SVC_XP_AUTH)
 +	SVC_XP_AUTH(xprt) = svc_auth_none;
 +#else 
 	xprt->xp_auth = &svc_auth_none;
 +#endif
 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
 +#if !defined(SVC_XP_AUTH)
 	SVCAUTH_DESTROY(xprt->xp_auth);
 	xprt->xp_auth = NULL;
 +#endif
 +
 done:
 	if (buffer)
 		free(buffer);
 diff --git a/src/rpcbind.c b/src/rpcbind.c
 index 045daa1..87ccdc2 100644
 --- a/src/rpcbind.c
 +++ b/src/rpcbind.c
@@ -87,6 +87,7 @@ static inline void __nss_configure_lookup(const char *db, const char *s) {}
 int debugging = 0;	/* Tell me what's going on */
 int doabort = 0;	/* When debugging, do an abort on errors */
 int dofork = 1;		/* fork? */
 +int createdsocket = 0;  /* Did I create the socket or systemd did it for me? */
 rpcblist_ptr list_rbl;	/* A list of version 3/4 rpcbind services */
@@ -135,13 +136,13 @@ char *tcp_uaddr;	/* Universal TCP address */
 static char servname[] = "rpcbind";
 static char superuser[] = "superuser";
 -int main __P((int, char *[]));
 +int main(int, char *[]);
 -static int init_transport __P((struct netconfig *));
 -static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *,
 -			     struct netbuf *));
 -static void terminate __P((int));
 -static void parseargs __P((int, char *[]));
 +static int init_transport(struct netconfig *);
 +static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *,
 +			     struct netbuf *);
 +static void terminate(int);
 +static void parseargs(int, char *[]);
 int
 main(int argc, char *argv[])
@@ -445,6 +446,7 @@ init_transport(struct netconfig *nconf)
 		memset(&sun, 0, sizeof sun);
 		sun.sun_family = AF_LOCAL;
 		unlink(_PATH_RPCBINDSOCK);
 +		createdsocket = 1; /* We are now in the process of creating the unix socket */
 		strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
 		addrlen = SUN_LEN(&sun);
 		sa = (struct sockaddr *)&sun;
@@ -846,7 +848,8 @@ static void
 terminate(int dummy /*__unused*/)
 {
 	close(rpcbindlockfd);
 -	unlink(_PATH_RPCBINDSOCK);
 +	if(createdsocket)
 +		unlink(_PATH_RPCBINDSOCK);
 	unlink(RPCBINDDLOCK);
 #ifdef WARMSTART
 	write_warmstart();	/* Dump yourself */
 diff --git a/src/security.c b/src/security.c
 index 0c9453f..c54ce26 100644
 --- a/src/security.c
 +++ b/src/security.c
@@ -17,6 +17,8 @@
 #include <syslog.h>
 #include <netdb.h>
 +#include "xlog.h"
 +
 /*
  * XXX for special case checks in check_callit.
  */
 diff --git a/src/util.c b/src/util.c
 index a6c835b..74b0284 100644
 --- a/src/util.c
 +++ b/src/util.c
@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
 static struct sockaddr_in6 *local_in6;
 #endif
 -static int bitmaskcmp __P((void *, void *, void *, int));
 +static int bitmaskcmp(void *, void *, void *, int);
 /*
  * For all bits set in "mask", compare the corresponding bits in
 diff --git a/src/warmstart.c b/src/warmstart.c
 index b6eb73e..122a058 100644
 --- a/src/warmstart.c
 +++ b/src/warmstart.c
@@ -58,8 +58,8 @@
 #define	PMAPFILE	RPCBIND_STATEDIR "/portmap.xdr"
 #endif
 -static bool_t write_struct __P((char *, xdrproc_t, void *));
 -static bool_t read_struct __P((char *, xdrproc_t, void *));
 +static bool_t write_struct(char *, xdrproc_t, void *);
 +static bool_t read_struct(char *, xdrproc_t, void *);
 static bool_t
 write_struct(char *filename, xdrproc_t structproc, void *list)
 diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
 new file mode 100644
 index 0000000..c173b83
 --- /dev/null
 +++ b/systemd/rpcbind.service.in
@@ -0,0 +1,17 @@
 +[Unit]
 +Description=RPC Bind
 +Documentation=man:rpcbind(8)
 +DefaultDependencies=no
 +
 +# Make sure we use the IP addresses listed for
 +# rpcbind.socket, no matter how this unit is started.
 +Wants=rpcbind.socket
 +After=rpcbind.socket
 +
 +[Service]
 +Type=notify
 +# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
 +ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
 +
 +[Install]
 +WantedBy=multi-user.target
 diff --git a/systemd/rpcbind.socket b/systemd/rpcbind.socket
 new file mode 100644
 index 0000000..3b1a936
 --- /dev/null
 +++ b/systemd/rpcbind.socket
@@ -0,0 +1,18 @@
 +[Unit]
 +Description=RPCbind Server Activation Socket
 +DefaultDependencies=no
 +Wants=rpcbind.target
 +Before=rpcbind.target
 +
 +[Socket]
 +ListenStream=/run/rpcbind.sock
 +
 +# RPC netconfig can't handle ipv6/ipv4 dual sockets
 +BindIPv6Only=ipv6-only
 +ListenStream=0.0.0.0:111
 +ListenDatagram=0.0.0.0:111
 +ListenStream=[::]:111
 +ListenDatagram=[::]:111
 +
 +[Install]
 +WantedBy=sockets.target
--- a/rpcbind-0.2.4-systemd-statdir.patch
+++ b/rpcbind-0.2.4-systemd-statdir.patch
@ -1,27 +0,0 @@
 commit ee569be4d6189a68b38d2af162af00ff475b48e2
 Author: Yann Leprince <yann.leprince@ylep.fr>
 Date:   Wed Dec 21 14:32:54 2016 -0500
    Fix boot dependency in systemd service file
    From: Yann Leprince <yann.leprince@ylep.fr>
    This fix ensures that a separate /var partition will be mounted before
    rpcbind tries to write its status to /var/run.
    Acked-by: NeilBrown <neilb@suse.com>
    Signed-off-by: Yann Leprince <yann.leprince@ylep.fr>
    Signed-off-by: Steve Dickson <steved@redhat.com>
 diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
 index e7e86da..03a9e0b 100644
 --- a/systemd/rpcbind.service.in
 +++ b/systemd/rpcbind.service.in
@@ -2,6 +2,7 @@
 Description=RPC Bind
 Documentation=man:rpcbind(8)
 DefaultDependencies=no
 +RequiresMountsFor=@statedir@
 # Make sure we use the IP addresses listed for
 # rpcbind.socket, no matter how this unit is started.
--- a/rpcbind-0.2.5-rc1.patch
+++ b/rpcbind-0.2.5-rc1.patch
@ -0,0 +1,185 @@
 diff --git a/src/pmap_svc.c b/src/pmap_svc.c
 index 4c744fe..e926cdc 100644
 --- a/src/pmap_svc.c
 +++ b/src/pmap_svc.c
@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
 	long ans;
 	uid_t uid;
 	char uidbuf[32];
 +	int rc = TRUE;
 	/*
 	 * Can't use getpwnam here. We might end up calling ourselves
@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
 	if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
 		svcerr_decode(xprt);
 -		return (FALSE);
 +		rc = FALSE;
 +		goto done;
 	}
 #ifdef RPCBIND_DEBUG
 	if (debugging)
@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
 	if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) {
 		svcerr_weakauth(xprt);
 -		return (FALSE);
 +		rc = (FALSE);
 +		goto done;
 	}
 	rpcbreg.r_prog = reg.pm_prog;
@@ -258,7 +261,16 @@ done_change:
 		rpcbs_set(RPCBVERS_2_STAT, ans);
 	else
 		rpcbs_unset(RPCBVERS_2_STAT, ans);
 -	return (TRUE);
 +done:
 +	if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
 +		if (debugging) {
 +			(void) xlog(LOG_DEBUG, "unable to free arguments\n");
 +			if (doabort) {
 +				rpcbind_abort();
 +			}
 +		}
 +	}
 +	return (rc);
 }
 /* ARGSUSED */
@@ -272,15 +284,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 #ifdef RPCBIND_DEBUG
 	char *uaddr;
 #endif
 +	int rc = TRUE;
 	if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
 		svcerr_decode(xprt);
 -		return (FALSE);
 +		rc = FALSE;
 +		goto done;
 	}
 	if (!check_access(xprt, PMAPPROC_GETPORT, reg.pm_prog, PMAPVERS)) {
 		svcerr_weakauth(xprt);
 -		return FALSE;
 +		rc = FALSE;
 +		goto done;
 	}
 #ifdef RPCBIND_DEBUG
@@ -330,21 +345,34 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 		pmap_ipprot2netid(reg.pm_prot) ?: "<unknown>",
 		port ? udptrans : "");
 -	return (TRUE);
 +done:
 +	if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
 +		if (debugging) {
 +			(void) xlog(LOG_DEBUG, "unable to free arguments\n");
 +			if (doabort) {
 +				rpcbind_abort();
 +			}
 +		}
 +	}
 +	return (rc);
 }
 /* ARGSUSED */
 static bool_t
 pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 {
 +	int rc = TRUE;
 +
 	if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) {
 		svcerr_decode(xprt);
 -		return (FALSE);
 +		rc = FALSE;
 +		goto done;
 	}
 	if (!check_access(xprt, PMAPPROC_DUMP, 0, PMAPVERS)) {
 		svcerr_weakauth(xprt);
 -		return FALSE;
 +		rc = FALSE;
 +		goto done;
 	}
 	if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr,
@@ -354,7 +382,17 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
 			rpcbind_abort();
 		}
 	}
 -	return (TRUE);
 +
 +done:
 +	if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) {
 +		if (debugging) {
 +			(void) xlog(LOG_DEBUG, "unable to free arguments\n");
 +			if (doabort) {
 +				rpcbind_abort();
 +			}
 +		}
 +	}
 +	return (rc);
 }
 int pmap_netid2ipprot(const char *netid)
 diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
 index 709e3fb..091f530 100644
 --- a/src/rpcb_svc.c
 +++ b/src/rpcb_svc.c
@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
 		svcerr_decode(transp);
 		if (debugging)
 			(void) xlog(LOG_DEBUG, "rpcbind: could not decode");
 -		return;
 +		goto done;
 	}
 	if (rqstp->rq_proc == RPCBPROC_SET
 diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
 index 5094879..eebbbbe 100644
 --- a/src/rpcb_svc_4.c
 +++ b/src/rpcb_svc_4.c
@@ -218,7 +218,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
 		svcerr_decode(transp);
 		if (debugging)
 			(void) xlog(LOG_DEBUG, "rpcbind: could not decode\n");
 -		return;
 +		goto done;
 	}
 	if (rqstp->rq_proc == RPCBPROC_SET
 diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
 index 5862c26..cb63afd 100644
 --- a/src/rpcb_svc_com.c
 +++ b/src/rpcb_svc_com.c
@@ -927,6 +927,14 @@ error:
 	if (call_msg.rm_xid != 0)
 		(void) free_slot_by_xid(call_msg.rm_xid);
 out:
 +	if (!svc_freeargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
 +		if (debugging) {
 +			(void) xlog(LOG_DEBUG, "unable to free arguments\n");
 +			if (doabort) {
 +				rpcbind_abort();
 +			}
 +		}
 +	}
 	if (local_uaddr)
 		free(local_uaddr);
 	if (buf_alloc)
 diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
 index e7e86da..03a9e0b 100644
 --- a/systemd/rpcbind.service.in
 +++ b/systemd/rpcbind.service.in
@@ -2,6 +2,7 @@
 Description=RPC Bind
 Documentation=man:rpcbind(8)
 DefaultDependencies=no
 +RequiresMountsFor=@statedir@
 # Make sure we use the IP addresses listed for
 # rpcbind.socket, no matter how this unit is started.
--- a/rpcbind.spec
+++ b/rpcbind.spec
@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.4
-Release:        6%{?dist}
+Release:        6.rc1%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@ -19,7 +19,7 @@ Requires(post): chkconfig systemd
 Requires(preun): systemd
 Requires(postun): systemd coreutils
-Patch001: rpcbind-0.2.4-systemd-statdir.patch
+Patch001: rpcbind-0.2.5-rc1.patch
 Patch100: rpcbind-0.2.3-systemd-envfile.patch
 Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
@ -139,6 +139,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 %changelog
 * Thu May 11 2017 Steve Dickson <steved@redhat.com> - 0.2.4-6.rc1
 - Fixed memory leaks (bz 1448128)
 * Tue Mar 21 2017 Steve Dickson <steved@redhat.com> - 0.2.4-6
 - Try creating statdir once when opening lock file fails (bz 1401561)