SUNRPC: Use unsigned string lengths in xdr_decode_string_inplace
Subsystems (3)
PATCH 1/8 SUNRPC: Use unsigned string lengths in xdr_decode_string_inplace
XDR strings, opaques, and net objects should all use unsigned lengths. To wit, RFC 4506 says:
4.2. Unsigned Integer
An XDR unsigned integer is a 32-bit datum that encodes a non-negative integer in the range [0,4294967295].
...
4.11. String
The standard defines a string of n (numbered 0 through n-1) ASCII bytes to be the number n encoded as an unsigned integer (as described above), and followed by the n bytes of the string.
After this patch, xdr_decode_string_inplace now matches the other XDR string and array helpers that take a string length argument. See:
xdr_encode_opaque_fixed, xdr_encode_opaque, xdr_encode_array
---
include/linux/sunrpc/xdr.h | 3 ++- net/sunrpc/xdr.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
include/linux/sunrpc/xdr.h +2 -1
@@ -112,7 +112,8 @@ struct xdr_buf {__be32 *xdr_encode_opaque_fixed (__be32 *p,const void *ptr,unsigned int len);__be32 *xdr_encode_opaque (__be32 *p,const void *ptr,unsigned int len);__be32 *xdr_encode_string (__be32 *p,const char *s); -__be32 *xdr_decode_string_inplace (__be32 *p,char **sp,int *lenp,int maxlen); +__be32 *xdr_decode_string_inplace (__be32 *p,char **sp,unsigned int *lenp, +unsigned int maxlen);__be32 *xdr_encode_netobj (__be32 *p,const struct xdr_netobj *);__be32 *xdr_decode_netobj (__be32 *p,struct xdr_netobj *);
net/sunrpc/xdr.c +5 -3
@@ -93,11 +93,13 @@ xdr_encode_string(__be32 *p, const char *string) }__be32 * -xdr_decode_string_inplace (__be32 *p,char **sp,int *lenp,int maxlen) +xdr_decode_string_inplace (__be32 *p,char **sp, +unsigned int *lenp,unsigned int maxlen) { -unsigned int len; +u32 len; -if ((len =ntohl (*p++)) > maxlen) + len =ntohl (*p++); +if (len > maxlen)return NULL ; *lenp = len; *sp = (char *) p;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Thanks Chuck.
This series all:
Just one question:
Quoted 5 lines
net/sunrpc/xdr.c +0
-0
net/sunrpc/xdr.c xdr_encode_string(__be32 *p, const char *string) · line 99
Quoted 9 lines
net/sunrpc/xdr.c +3
-2@@ -93,11 +93,13 @@ xdr_encode_string(__be32 *p, const char *string) }__be32 * -xdr_decode_string_inplace (__be32 *p,char **sp,int *lenp,int maxlen) +xdr_decode_string_inplace (__be32 *p,char **sp, +unsigned int *lenp,unsigned int maxlen) { -unsigned int len; +u32 len;
What is the reason for making this a u32? You seem to be happy with "unsigned int" everywhere else.
It's not important, but I'm curious.
NeilBrown
net/sunrpc/xdr.c xdr_encode_string(__be32 *p, const char *string) · line 105
Quoted 7 lines
net/sunrpc/xdr.c +2
-1-if ((len =ntohl (*p++)) > maxlen) + len =ntohl (*p++); +if (len > maxlen)return NULL ; *lenp = len; *sp = (char *) p;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Quoted 24 lines · Neil Brown
Thanks Chuck.
This series all:Acked-by NeilBrown <[email protected]>Just one question:
Quoted 5 lines
net/sunrpc/xdr.c +0
-0net/sunrpc/xdr.c xdr_encode_string(__be32 *p, const char *string) · line 99
Quoted 9 lines
net/sunrpc/xdr.c +3
-2@@ -93,11 +93,13 @@ xdr_encode_string(__be32 *p, const char *string) }__be32 * -xdr_decode_string_inplace (__be32 *p,char **sp,int *lenp,int maxlen) +xdr_decode_string_inplace (__be32 *p,char **sp, +unsigned int *lenp,unsigned int maxlen) { -unsigned int len; +u32 len;What is the reason for making this a u32? You seem to be happy with "unsigned int" everywhere else.
Quoted 1 line
It's not important, but I'm curious.
It boils down to documenting exactly what comes off the wire, independent of what the local "unsigned int" is.
begin:vcard
fn:Chuck Lever
n:Lever;Chuck
org:Oracle Corporation;Corporate Architecture: Linux Projects Group adr:;;1015 Granger Avenue;Ann Arbor;MI;48104;USA title:Principal Member of Staff
tel;work:+1 248 614 5091
x-mozilla-html:FALSE
version:2.1
end:vcard
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs