mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-05-09 21:42:09 +02:00
Chuck Lever
27b0fcae8f
The xdrgen decoders for strings and opaque data had an
optimization that skipped calling xdr_inline_decode() when the
item length was zero. This left the data pointer uninitialized,
which could lead to unpredictable behavior when callers access
it.
Remove the zero-length check and always call xdr_inline_decode().
When passed a length of zero, xdr_inline_decode() returns the
current buffer position, which is valid and matches the behavior
of hand-coded XDR decoders throughout the kernel.
Fixes: 4b132aacb0 ("tools: Add xdrgen")
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
300 lines
6.0 KiB
C
300 lines
6.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2024 Oracle and/or its affiliates.
|
|
*
|
|
* This header defines XDR data type primitives specified in
|
|
* Section 4 of RFC 4506, used by RPC programs implemented
|
|
* in the Linux kernel.
|
|
*/
|
|
|
|
#ifndef _SUNRPC_XDRGEN__BUILTINS_H_
|
|
#define _SUNRPC_XDRGEN__BUILTINS_H_
|
|
|
|
#include <linux/sunrpc/xdr.h>
|
|
|
|
static inline bool
|
|
xdrgen_decode_void(struct xdr_stream *xdr)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_void(struct xdr_stream *xdr)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_bool(struct xdr_stream *xdr, bool *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = (*p != xdr_zero);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_bool(struct xdr_stream *xdr, bool val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = val ? xdr_one : xdr_zero;
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* De facto (non-standard but commonly implemented) signed short type:
|
|
* - Wire sends sign-extended 32-bit value (e.g., 0xFFFFFFFF)
|
|
* - be32_to_cpup() returns u32 (0xFFFFFFFF)
|
|
* - Explicit (s16) cast truncates to 16 bits (0xFFFF = -1)
|
|
*/
|
|
static inline bool
|
|
xdrgen_decode_short(struct xdr_stream *xdr, s16 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = (s16)be32_to_cpup(p);
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* De facto (non-standard but commonly implemented) signed short type:
|
|
* - C integer promotion sign-extends s16 val to int before passing to
|
|
* cpu_to_be32()
|
|
* - This is well-defined: -1 as s16 -1 as int 0xFFFFFFFF on wire
|
|
*/
|
|
static inline bool
|
|
xdrgen_encode_short(struct xdr_stream *xdr, s16 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = cpu_to_be32(val);
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* De facto (non-standard but commonly implemented) unsigned short type:
|
|
* 16-bit integer zero-extended to fill one XDR_UNIT.
|
|
*/
|
|
static inline bool
|
|
xdrgen_decode_unsigned_short(struct xdr_stream *xdr, u16 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = (u16)be32_to_cpup(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_unsigned_short(struct xdr_stream *xdr, u16 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = cpu_to_be32(val);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_int(struct xdr_stream *xdr, s32 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = be32_to_cpup(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_int(struct xdr_stream *xdr, s32 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = cpu_to_be32(val);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_unsigned_int(struct xdr_stream *xdr, u32 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = be32_to_cpup(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_unsigned_int(struct xdr_stream *xdr, u32 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = cpu_to_be32(val);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_long(struct xdr_stream *xdr, s32 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = be32_to_cpup(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_long(struct xdr_stream *xdr, s32 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = cpu_to_be32(val);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_unsigned_long(struct xdr_stream *xdr, u32 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = be32_to_cpup(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_unsigned_long(struct xdr_stream *xdr, u32 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*p = cpu_to_be32(val);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_hyper(struct xdr_stream *xdr, s64 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT * 2);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = get_unaligned_be64(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_hyper(struct xdr_stream *xdr, s64 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT * 2);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
put_unaligned_be64(val, p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_unsigned_hyper(struct xdr_stream *xdr, u64 *ptr)
|
|
{
|
|
__be32 *p = xdr_inline_decode(xdr, XDR_UNIT * 2);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
*ptr = get_unaligned_be64(p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_unsigned_hyper(struct xdr_stream *xdr, u64 val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT * 2);
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
put_unaligned_be64(val, p);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_string(struct xdr_stream *xdr, string *ptr, u32 maxlen)
|
|
{
|
|
__be32 *p;
|
|
u32 len;
|
|
|
|
if (unlikely(xdr_stream_decode_u32(xdr, &len) < 0))
|
|
return false;
|
|
if (unlikely(maxlen && len > maxlen))
|
|
return false;
|
|
p = xdr_inline_decode(xdr, len);
|
|
if (unlikely(!p))
|
|
return false;
|
|
ptr->data = (unsigned char *)p;
|
|
ptr->len = len;
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_string(struct xdr_stream *xdr, string val, u32 maxlen)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT + xdr_align_size(val.len));
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
xdr_encode_opaque(p, val.data, val.len);
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_decode_opaque(struct xdr_stream *xdr, opaque *ptr, u32 maxlen)
|
|
{
|
|
__be32 *p;
|
|
u32 len;
|
|
|
|
if (unlikely(xdr_stream_decode_u32(xdr, &len) < 0))
|
|
return false;
|
|
if (unlikely(maxlen && len > maxlen))
|
|
return false;
|
|
p = xdr_inline_decode(xdr, len);
|
|
if (unlikely(!p))
|
|
return false;
|
|
ptr->data = (u8 *)p;
|
|
ptr->len = len;
|
|
return true;
|
|
}
|
|
|
|
static inline bool
|
|
xdrgen_encode_opaque(struct xdr_stream *xdr, opaque val)
|
|
{
|
|
__be32 *p = xdr_reserve_space(xdr, XDR_UNIT + xdr_align_size(val.len));
|
|
|
|
if (unlikely(!p))
|
|
return false;
|
|
xdr_encode_opaque(p, val.data, val.len);
|
|
return true;
|
|
}
|
|
|
|
#endif /* _SUNRPC_XDRGEN__BUILTINS_H_ */
|