Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f7e1961103 | ||
|
|
308f47b091 | ||
|
|
cbda124cf3 |
7 changed files with 108 additions and 397 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,4 +1,4 @@
|
|||
rpcbind-0.2.4
|
||||
/rpcbind-0.2.4.tar.bz2
|
||||
x86_64
|
||||
Makefile
|
||||
/rpcbind-1.2.5.tar.bz2
|
||||
rpcbind-1.2.5/
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
||||
--- rpcbind-0.2.4/configure.ac.orig 2017-12-16 15:52:22.774298138 -0500
|
||||
+++ rpcbind-0.2.4/configure.ac 2017-12-16 15:52:45.301075188 -0500
|
||||
@@ -52,6 +52,17 @@ AC_ARG_WITH([systemdsystemunitdir],
|
||||
diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac
|
||||
--- rpcbind-1.2.5/configure.ac.orig 2018-08-15 10:51:19.000000000 -0400
|
||||
+++ rpcbind-1.2.5/configure.ac 2018-08-15 11:14:23.933946110 -0400
|
||||
@@ -56,6 +56,17 @@ AC_ARG_WITH([systemdsystemunitdir],
|
||||
fi
|
||||
AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
|
||||
|
||||
|
|
@ -19,10 +19,10 @@ diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
|||
AS_IF([test x$enable_libwrap = xyes], [
|
||||
AC_CHECK_LIB([wrap], [hosts_access], ,
|
||||
AC_MSG_ERROR([libwrap support requested but unable to find libwrap]))
|
||||
diff -up rpcbind-0.2.4/Makefile.am.orig rpcbind-0.2.4/Makefile.am
|
||||
--- rpcbind-0.2.4/Makefile.am.orig 2017-12-16 15:52:22.774298138 -0500
|
||||
+++ rpcbind-0.2.4/Makefile.am 2017-12-16 15:52:45.301075188 -0500
|
||||
@@ -55,6 +55,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS)
|
||||
diff -up rpcbind-1.2.5/Makefile.am.orig rpcbind-1.2.5/Makefile.am
|
||||
--- rpcbind-1.2.5/Makefile.am.orig 2018-08-15 10:51:19.000000000 -0400
|
||||
+++ rpcbind-1.2.5/Makefile.am 2018-08-15 11:14:23.934946111 -0400
|
||||
@@ -59,6 +59,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS)
|
||||
systemdsystemunit_DATA = \
|
||||
systemd/rpcbind.service \
|
||||
systemd/rpcbind.socket
|
||||
|
|
@ -32,9 +32,9 @@ diff -up rpcbind-0.2.4/Makefile.am.orig rpcbind-0.2.4/Makefile.am
|
|||
endif
|
||||
|
||||
rpcinfo_SOURCES = src/rpcinfo.c
|
||||
diff -up rpcbind-0.2.4/systemd/rpcbind.conf.orig rpcbind-0.2.4/systemd/rpcbind.conf
|
||||
--- rpcbind-0.2.4/systemd/rpcbind.conf.orig 2017-12-16 15:52:45.301075188 -0500
|
||||
+++ rpcbind-0.2.4/systemd/rpcbind.conf 2017-12-16 15:52:45.301075188 -0500
|
||||
diff -up rpcbind-1.2.5/systemd/rpcbind.conf.orig rpcbind-1.2.5/systemd/rpcbind.conf
|
||||
--- rpcbind-1.2.5/systemd/rpcbind.conf.orig 2018-08-15 11:14:23.934946111 -0400
|
||||
+++ rpcbind-1.2.5/systemd/rpcbind.conf 2018-08-15 11:14:23.934946111 -0400
|
||||
@@ -0,0 +1,2 @@
|
||||
+#Type Path Mode UID GID Age Argument
|
||||
+D /run/rpcbind 0700 rpc rpc - -
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
||||
--- rpcbind-0.2.4/configure.ac.orig 2017-12-16 15:53:47.253462041 -0500
|
||||
+++ rpcbind-0.2.4/configure.ac 2017-12-16 15:54:01.089325106 -0500
|
||||
@@ -22,8 +22,8 @@ AC_ARG_ENABLE([warmstarts],
|
||||
AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes)
|
||||
diff -up rpcbind-1.2.5/configure.ac.orig rpcbind-1.2.5/configure.ac
|
||||
--- rpcbind-1.2.5/configure.ac.orig 2018-08-15 11:15:14.188974027 -0400
|
||||
+++ rpcbind-1.2.5/configure.ac 2018-08-15 11:15:44.948991114 -0400
|
||||
@@ -26,8 +26,8 @@ AC_ARG_ENABLE([rmtcalls],
|
||||
AM_CONDITIONAL(RMTCALLS, test x$enable_rmtcalls = xyes)
|
||||
|
||||
AC_ARG_WITH([statedir],
|
||||
- AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/var/run/rpcbind@:>@])
|
||||
|
|
@ -12,10 +12,10 @@ diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
|||
AC_SUBST([statedir], [$with_statedir])
|
||||
|
||||
AC_ARG_WITH([rpcuser],
|
||||
diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
|
||||
--- rpcbind-0.2.4/configure.orig 2016-11-30 09:03:59.000000000 -0500
|
||||
+++ rpcbind-0.2.4/configure 2017-12-16 15:54:01.091325086 -0500
|
||||
@@ -1387,7 +1387,7 @@ Optional Features:
|
||||
diff -up rpcbind-1.2.5/configure.orig rpcbind-1.2.5/configure
|
||||
--- rpcbind-1.2.5/configure.orig 2018-08-15 11:00:32.000000000 -0400
|
||||
+++ rpcbind-1.2.5/configure 2018-08-15 11:15:44.951991115 -0400
|
||||
@@ -1391,7 +1391,7 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
|
|
@ -24,7 +24,7 @@ diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
|
|||
|
||||
--with-rpcuser=ARG use ARG for RPC [default=root]
|
||||
|
||||
@@ -3883,7 +3883,7 @@ fi
|
||||
@@ -3901,7 +3901,7 @@ fi
|
||||
if test "${with_statedir+set}" = set; then :
|
||||
withval=$with_statedir;
|
||||
else
|
||||
|
|
@ -33,9 +33,9 @@ diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
|
|||
fi
|
||||
|
||||
statedir=$with_statedir
|
||||
diff -up rpcbind-0.2.4/man/rpcbind-fr.8.orig rpcbind-0.2.4/man/rpcbind-fr.8
|
||||
--- rpcbind-0.2.4/man/rpcbind-fr.8.orig 2016-11-28 15:47:28.000000000 -0500
|
||||
+++ rpcbind-0.2.4/man/rpcbind-fr.8 2017-12-16 15:54:01.091325086 -0500
|
||||
diff -up rpcbind-1.2.5/man/rpcbind-fr.8.orig rpcbind-1.2.5/man/rpcbind-fr.8
|
||||
--- rpcbind-1.2.5/man/rpcbind-fr.8.orig 2018-08-15 10:51:19.000000000 -0400
|
||||
+++ rpcbind-1.2.5/man/rpcbind-fr.8 2018-08-15 11:15:44.951991115 -0400
|
||||
@@ -138,8 +138,8 @@ est redémarré.
|
||||
.Xr rpcbind 3 ,
|
||||
.Xr rpcinfo 8
|
||||
|
|
@ -47,9 +47,9 @@ diff -up rpcbind-0.2.4/man/rpcbind-fr.8.orig rpcbind-0.2.4/man/rpcbind-fr.8
|
|||
.Sh TRADUCTION
|
||||
Aurelien CHARBON (Sept 2003)
|
||||
.El
|
||||
diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c
|
||||
--- rpcbind-0.2.4/src/rpcbind.c.orig 2016-11-28 15:47:28.000000000 -0500
|
||||
+++ rpcbind-0.2.4/src/rpcbind.c 2017-12-16 15:54:01.092325076 -0500
|
||||
diff -up rpcbind-1.2.5/src/rpcbind.c.orig rpcbind-1.2.5/src/rpcbind.c
|
||||
--- rpcbind-1.2.5/src/rpcbind.c.orig 2018-08-15 10:51:19.000000000 -0400
|
||||
+++ rpcbind-1.2.5/src/rpcbind.c 2018-08-15 11:15:44.952991116 -0400
|
||||
@@ -106,7 +106,7 @@ char *nss_modules = "files";
|
||||
/* who to suid to if -s is given */
|
||||
#define RUN_AS "daemon"
|
||||
|
|
|
|||
|
|
@ -1,362 +0,0 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 43c2710..c160a95 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -29,7 +29,8 @@ if LIBWRAP
|
||||
AM_CPPFLAGS += -DLIBWRAP
|
||||
endif
|
||||
|
||||
-bin_PROGRAMS = rpcbind rpcinfo
|
||||
+bin_PROGRAMS = rpcinfo
|
||||
+sbin_PROGRAMS = rpcbind
|
||||
|
||||
rpcbind_SOURCES = \
|
||||
src/check_bound.c \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3790310..359a418 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -61,9 +61,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
|
||||
|
||||
AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
|
||||
|
||||
-# make bindir available for substitution in config file
|
||||
+# make sbindir available for substitution in config file
|
||||
# 2 "evals" needed to expand variable names
|
||||
-AC_SUBST([_bindir])
|
||||
-AC_CONFIG_COMMANDS_PRE([eval eval _bindir=$bindir])
|
||||
+AC_SUBST([_sbindir])
|
||||
+AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
|
||||
|
||||
AC_OUTPUT([Makefile systemd/rpcbind.service])
|
||||
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
||||
index 4c744fe..a53dd5f 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 *)®)) {
|
||||
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,18 @@ 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 *)®)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
@@ -272,15 +286,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 *)®)) {
|
||||
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 +347,36 @@ 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 *)®)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ 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 +386,19 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
rpcbind_abort();
|
||||
}
|
||||
}
|
||||
- return (TRUE);
|
||||
+
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ 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..9c1c3af 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -612,9 +612,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
struct netconfig *nconf;
|
||||
struct netbuf *caller;
|
||||
struct r_rmtcall_args a;
|
||||
- char *buf_alloc = NULL, *outbufp;
|
||||
- char *outbuf_alloc = NULL;
|
||||
- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
|
||||
+ char outbuf[RPC_BUF_MAX];
|
||||
struct netbuf *na = (struct netbuf *) NULL;
|
||||
struct rpc_msg call_msg;
|
||||
int outlen;
|
||||
@@ -635,36 +633,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
}
|
||||
if (si.si_socktype != SOCK_DGRAM)
|
||||
return; /* Only datagram type accepted */
|
||||
- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
|
||||
- if (sendsz == 0) { /* data transfer not supported */
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- /*
|
||||
- * Should be multiple of 4 for XDR.
|
||||
- */
|
||||
- sendsz = ((sendsz + 3) / 4) * 4;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- buf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- buf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (buf_alloc == NULL) {
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No Memory!\n");
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- a.rmt_args.args = buf_alloc;
|
||||
- } else {
|
||||
- a.rmt_args.args = buf;
|
||||
- }
|
||||
+ sendsz = UDPMSGSIZE;
|
||||
|
||||
call_msg.rm_xid = 0; /* For error checking purposes */
|
||||
+ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */
|
||||
if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_decode(transp);
|
||||
@@ -700,11 +672,11 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
|
||||
rpcbs_rmtcall(versnum - 2, reply_type, a.rmt_prog, a.rmt_vers,
|
||||
a.rmt_proc, transp->xp_netid, rbl);
|
||||
-
|
||||
if (rbl == (rpcblist_ptr)NULL) {
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
- xlog(LOG_DEBUG, "not found\n");
|
||||
+ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n",
|
||||
+ a.rmt_prog, a.rmt_vers);
|
||||
#endif
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_noprog(transp);
|
||||
@@ -818,24 +790,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
||||
call_msg.rm_call.cb_prog = a.rmt_prog;
|
||||
call_msg.rm_call.cb_vers = a.rmt_vers;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- outbuf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- outbuf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (outbuf_alloc == NULL) {
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No memory!\n");
|
||||
- goto error;
|
||||
- }
|
||||
- xdrmem_create(&outxdr, outbuf_alloc, sendsz, XDR_ENCODE);
|
||||
- } else {
|
||||
- xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
|
||||
- }
|
||||
+
|
||||
+ memset(outbuf, '\0', sendsz); /* Zero out the output buffer */
|
||||
+ xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
|
||||
+
|
||||
if (!xdr_callhdr(&outxdr, &call_msg)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_systemerr(transp);
|
||||
@@ -900,10 +858,6 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
goto error;
|
||||
}
|
||||
outlen = (int) XDR_GETPOS(&outxdr);
|
||||
- if (outbuf_alloc)
|
||||
- outbufp = outbuf_alloc;
|
||||
- else
|
||||
- outbufp = outbuf;
|
||||
|
||||
na = uaddr2taddr(nconf, local_uaddr);
|
||||
if (!na) {
|
||||
@@ -912,7 +866,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
goto error;
|
||||
}
|
||||
|
||||
- if (sendto(fd, outbufp, outlen, 0, (struct sockaddr *)na->buf, na->len)
|
||||
+ if (sendto(fd, outbuf, outlen, 0, (struct sockaddr *)na->buf, na->len)
|
||||
!= outlen) {
|
||||
if (debugging)
|
||||
xlog(LOG_DEBUG,
|
||||
@@ -927,12 +881,16 @@ 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)
|
||||
- free(buf_alloc);
|
||||
- if (outbuf_alloc)
|
||||
- free(outbuf_alloc);
|
||||
if (na) {
|
||||
free(na->buf);
|
||||
free(na);
|
||||
@@ -1094,7 +1052,6 @@ void
|
||||
my_svc_run()
|
||||
{
|
||||
int poll_ret, check_ret;
|
||||
- int n;
|
||||
|
||||
for (;;) {
|
||||
struct pollfd my_pollfd[svc_max_pollfd];
|
||||
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
||||
index e7e86da..7b1c74b 100644
|
||||
--- a/systemd/rpcbind.service.in
|
||||
+++ b/systemd/rpcbind.service.in
|
||||
@@ -2,16 +2,17 @@
|
||||
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.
|
||||
-Wants=rpcbind.socket
|
||||
-After=rpcbind.socket
|
||||
+Requires=rpcbind.socket
|
||||
+Wants=rpcbind.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
|
||||
-ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
+ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
64
rpcbind-1.2.5-rpcinfo-bufoverflow.patch
Normal file
64
rpcbind-1.2.5-rpcinfo-bufoverflow.patch
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
commit 0bc1c0ae7ce61a7ac8a8e9a9b2086268f011abf0
|
||||
Author: Steve Dickson <steved@redhat.com>
|
||||
Date: Tue Oct 9 09:19:50 2018 -0400
|
||||
|
||||
rpcinfo: Fix stack buffer overflow
|
||||
|
||||
*** buffer overflow detected ***: rpcinfo terminated
|
||||
======= Backtrace: =========
|
||||
/lib64/libc.so.6(+0x721af)[0x7ff24c4451af]
|
||||
/lib64/libc.so.6(__fortify_fail+0x37)[0x7ff24c4ccdc7]
|
||||
/lib64/libc.so.6(+0xf8050)[0x7ff24c4cb050]
|
||||
rpcinfo(+0x435f)[0xef3be2635f]
|
||||
rpcinfo(+0x1c62)[0xef3be23c62]
|
||||
/lib64/libc.so.6(__libc_start_main+0xf5)[0x7ff24c3f36e5]
|
||||
rpcinfo(+0x2739)[0xef3be24739]
|
||||
======= Memory map: ========
|
||||
...
|
||||
The patch below fixes it.
|
||||
|
||||
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
|
||||
Signed-off-by: Thomas Blume <thomas.blume@suse.com>
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/src/rpcinfo.c b/src/rpcinfo.c
|
||||
index 9b46864..cfdba88 100644
|
||||
--- a/src/rpcinfo.c
|
||||
+++ b/src/rpcinfo.c
|
||||
@@ -973,6 +973,7 @@ rpcbdump (dumptype, netid, argc, argv)
|
||||
(" program version(s) netid(s) service owner\n");
|
||||
for (rs = rs_head; rs; rs = rs->next)
|
||||
{
|
||||
+ size_t netidmax = sizeof(buf) - 1;
|
||||
char *p = buf;
|
||||
|
||||
printf ("%10ld ", rs->prog);
|
||||
@@ -985,12 +986,22 @@ rpcbdump (dumptype, netid, argc, argv)
|
||||
}
|
||||
printf ("%-10s", buf);
|
||||
buf[0] = '\0';
|
||||
- for (nl = rs->nlist; nl; nl = nl->next)
|
||||
- {
|
||||
- strcat (buf, nl->netid);
|
||||
- if (nl->next)
|
||||
- strcat (buf, ",");
|
||||
- }
|
||||
+
|
||||
+ for (nl = rs->nlist; nl; nl = nl->next)
|
||||
+ {
|
||||
+ strncat (buf, nl->netid, netidmax);
|
||||
+ if (strlen (nl->netid) < netidmax)
|
||||
+ netidmax -= strlen(nl->netid);
|
||||
+ else
|
||||
+ break;
|
||||
+
|
||||
+ if (nl->next && netidmax > 1)
|
||||
+ {
|
||||
+ strncat (buf, ",", netidmax);
|
||||
+ netidmax --;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
printf ("%-32s", buf);
|
||||
rpc = getrpcbynumber (rs->prog);
|
||||
if (rpc)
|
||||
19
rpcbind.spec
19
rpcbind.spec
|
|
@ -3,8 +3,8 @@
|
|||
%global rpcbind_state_dir %{_rundir}/rpcbind
|
||||
|
||||
Name: rpcbind
|
||||
Version: 0.2.4
|
||||
Release: 10.rc3%{?dist}.1
|
||||
Version: 1.2.5
|
||||
Release: 2%{?dist}
|
||||
Summary: Universal Addresses to RPC Program Number Mapper
|
||||
Group: System Environment/Daemons
|
||||
License: BSD
|
||||
|
|
@ -22,7 +22,7 @@ Requires(post): chkconfig systemd
|
|||
Requires(preun): systemd
|
||||
Requires(postun): systemd coreutils
|
||||
|
||||
Patch001: rpcbind-0.2.5-rc3.patch
|
||||
Patch001: rpcbind-1.2.5-rpcinfo-bufoverflow.patch
|
||||
|
||||
Patch100: rpcbind-0.2.3-systemd-envfile.patch
|
||||
Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
|
||||
|
|
@ -40,8 +40,7 @@ RPC calls on a server on that machine.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
# 1401561 - rpcbind-0.2.3-12.rc2.fc24 fails to start at boot
|
||||
# 1637562 - rpcinfo: Fix stack buffer overflow
|
||||
%patch001 -p1
|
||||
|
||||
%patch100 -p1
|
||||
|
|
@ -57,6 +56,7 @@ autoreconf -fisv
|
|||
--with-rpcuser="%rpcbind_user_group" \
|
||||
--with-nss-modules="files altfiles" \
|
||||
--sbindir=%{_bindir} \
|
||||
--enable-rmtcalls \
|
||||
--enable-debug
|
||||
|
||||
make all
|
||||
|
|
@ -129,6 +129,15 @@ fi
|
|||
%attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
|
||||
|
||||
%changelog
|
||||
* Thu Sep 19 2019 Steve Dickson <steved@redhat.com> - 1.2.5-2
|
||||
- Enable remote calls which are used by NIS and other packages (bz 1630672)
|
||||
|
||||
* Tue Oct 9 2018 Steve Dickson <steved@redhat.com> - 1.2.5-1
|
||||
- Fixed stack buffer overflow in rpcinfo (bz 1637562)
|
||||
|
||||
* Wed Aug 15 2018 Steve Dickson <steved@redhat.com> - 1.2.5-0
|
||||
- Updated to latest upstream release: 1_2_5
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-10.rc3.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
cf10cd41ed8228fc54c316191c1f07fe rpcbind-0.2.4.tar.bz2
|
||||
SHA512 (rpcbind-1.2.5.tar.bz2) = e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue