diff options
Diffstat (limited to 'yocto-poky/meta/recipes-extended/rpcbind')
5 files changed, 47 insertions, 1 deletions
diff --git a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch new file mode 100644 index 000000000..16b763ef0 --- /dev/null +++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch @@ -0,0 +1,43 @@ +From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 +From: Steve Dickson <steved@redhat.com> +Date: Mon, 2 Nov 2015 17:05:18 -0500 +Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly + +In the latest libtirpc version to access the xp_auth +one must use the SVC_XP_AUTH macro. To be backwards +compatible a couple ifdefs were added to use the +macro when it exists. + +Upstream-Status: Backport + +Signed-off-by: Steve Dickson <steved@redhat.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + src/rpcb_svc_com.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 4ae93f1..22d6c84 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -1295,10 +1295,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); +-- +2.4.0 + diff --git a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch index f156290bf..741a99035 100644 --- a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch +++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch @@ -36,6 +36,7 @@ Date: Thu Aug 6 16:27:20 2015 +0200 Signed-off-by: Olaf Kirch <okir@...e.de> Upstream-Status: Backport + CVE: CVE-2015-7236 Signed-off-by: Li Zhou <li.zhou@windriver.com> --- diff --git a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch index 9c72a1bdf..6fbc6364c 100644 --- a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch +++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch @@ -4,6 +4,7 @@ aliases. As a workaround we use "sunprc" instead of "portmapper" ported from alpine linux Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending Index: rpcbind-0.2.2/src/rpcbind.c =================================================================== diff --git a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service index b3ae2541a..9cdade495 100644 --- a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service +++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service @@ -5,7 +5,7 @@ Requires=rpcbind.socket [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/rpcbind.conf -ExecStart=@SBINDIR@/rpcbind -w $RPCBIND_OPTS +ExecStart=@SBINDIR@/rpcbind $RPCBIND_OPTS SuccessExitStatus=2 [Install] diff --git a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb index ecd3ba8a5..c19a1976a 100644 --- a/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb +++ b/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb @@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://init.d \ file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \ file://remove-sys-queue.patch \ + file://0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch \ ${UCLIBCPATCHES} \ ${MUSLPATCHES} \ file://rpcbind.conf \ |
