forked from pool/libtirpc
70 lines
1.8 KiB
Diff
70 lines
1.8 KiB
Diff
|
From 145272c2b6d89a1c3a7de86a2cbef43880f1b61b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Steve Dickson <steved@redhat.com>
|
||
|
|
Date: Wed, 11 Jul 2018 11:21:39 -0400
|
||
|
|
Subject: [PATCH] xdrstdio_create buffers do not output encoded values on ppc
|
||
|
|
|
||
|
|
References: bsc#1126096
|
||
|
|
Patch-mainline: libtirpc-1-0-4
|
||
|
|
Git-commit: 145272c2b6d89a1c3a7de86a2cbef43880f1b61b
|
||
|
|
|
||
|
|
The cause is that the xdr_putlong uses a long to store the
|
||
|
|
converted value, then passes it to fwrite as a byte buffer.
|
||
|
|
Only the first 4 bytes are written, which is okay for a LE
|
||
|
|
system after byteswapping, but writes all zeroes on BE systems.
|
||
|
|
|
||
|
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1261738
|
||
|
|
|
||
|
|
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
|
||
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||
|
|
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
||
|
|
---
|
||
|
|
src/xdr_stdio.c | 15 ++++++++++++---
|
||
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/xdr_stdio.c b/src/xdr_stdio.c
|
||
|
|
index 4410262275b6..846c7bf2a9c7 100644
|
||
|
|
--- a/src/xdr_stdio.c
|
||
|
|
+++ b/src/xdr_stdio.c
|
||
|
|
@@ -38,6 +38,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
+#include <stdint.h>
|
||
|
|
|
||
|
|
#include <arpa/inet.h>
|
||
|
|
#include <rpc/types.h>
|
||
|
|
@@ -103,10 +104,12 @@ xdrstdio_getlong(xdrs, lp)
|
||
|
|
XDR *xdrs;
|
||
|
|
long *lp;
|
||
|
|
{
|
||
|
|
+ int32_t mycopy;
|
||
|
|
|
||
|
|
- if (fread(lp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
|
||
|
|
+ if (fread(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
|
||
|
|
return (FALSE);
|
||
|
|
- *lp = (long)ntohl((u_int32_t)*lp);
|
||
|
|
+
|
||
|
|
+ *lp = (long)ntohl(mycopy);
|
||
|
|
return (TRUE);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -115,8 +118,14 @@ xdrstdio_putlong(xdrs, lp)
|
||
|
|
XDR *xdrs;
|
||
|
|
const long *lp;
|
||
|
|
{
|
||
|
|
- long mycopy = (long)htonl((u_int32_t)*lp);
|
||
|
|
+ int32_t mycopy;
|
||
|
|
+
|
||
|
|
+#if defined(_LP64)
|
||
|
|
+ if ((*lp > UINT32_MAX) || (*lp < INT32_MIN))
|
||
|
|
+ return (FALSE);
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
+ mycopy = (int32_t)htonl((int32_t)*lp);
|
||
|
|
if (fwrite(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
|
||
|
|
return (FALSE);
|
||
|
|
return (TRUE);
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|