Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Minor bug fix in XDR code introduced in last minute change before landing. 

1) Removed xdr_bytesrec typedef which has no consumers.  If we re-add
   it should also probably be xdr_bytesrec_t.
This commit is contained in:
Ricardo M. Correia 2009-03-11 05:39:03 +00:00 committed by Brian Behlendorf
parent f48b61938a
commit 6c33eb8162
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rpc/xdr.h
View File

@ -68,8 +68,6 @@ struct xdr_bytesrec {
size_t xc_num_avail; size_t xc_num_avail;
}; };
typedef struct xdr_bytesrec xdr_bytesrec;
/* /*
* XDR functions. * XDR functions.
*/ */

4
module/spl/spl-xdr.c
View File

@ -186,7 +186,7 @@ xdrmem_enc_bytes(XDR *xdrs, caddr_t cp, const uint_t cnt)
if (xdrs->x_addr > xdrs->x_addr_end) if (xdrs->x_addr > xdrs->x_addr_end)
return FALSE; return FALSE;
if (xdrs->x_addr_end - xdrs->x_addr > size) if (xdrs->x_addr_end - xdrs->x_addr < size)
return FALSE; return FALSE;
memcpy(xdrs->x_addr, cp, cnt); memcpy(xdrs->x_addr, cp, cnt);
@ -215,7 +215,7 @@ xdrmem_dec_bytes(XDR *xdrs, caddr_t cp, const uint_t cnt)
if (xdrs->x_addr > xdrs->x_addr_end) if (xdrs->x_addr > xdrs->x_addr_end)
return FALSE; return FALSE;
if (xdrs->x_addr_end - xdrs->x_addr > size) if (xdrs->x_addr_end - xdrs->x_addr < size)
return FALSE; return FALSE;
memcpy(cp, xdrs->x_addr, cnt); memcpy(cp, xdrs->x_addr, cnt);