lkml.org 
[lkml]   [2021]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 054/162] NLM: Fix svcxdr_encode_owner()
    Date
    From: Chuck Lever <chuck.lever@oracle.com>

    [ Upstream commit 89c485c7a3ecbc2ebd568f9c9c2edf3a8cf7485b ]

    Dai Ngo reports that, since the XDR overhaul, the NLM server crashes
    when the TEST procedure wants to return NLM_DENIED. There is a bug
    in svcxdr_encode_owner() that none of our standard test cases found.

    Replace the open-coded function with a call to an appropriate
    pre-fabricated XDR helper.

    Reported-by: Dai Ngo <Dai.Ngo@oracle.com>
    Fixes: a6a63ca5652e ("lockd: Common NLM XDR helpers")
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/lockd/svcxdr.h | 13 ++-----------
    1 file changed, 2 insertions(+), 11 deletions(-)

    diff --git a/fs/lockd/svcxdr.h b/fs/lockd/svcxdr.h
    index c69a0bb76c94..4f1a451da5ba 100644
    --- a/fs/lockd/svcxdr.h
    +++ b/fs/lockd/svcxdr.h
    @@ -134,18 +134,9 @@ svcxdr_decode_owner(struct xdr_stream *xdr, struct xdr_netobj *obj)
    static inline bool
    svcxdr_encode_owner(struct xdr_stream *xdr, const struct xdr_netobj *obj)
    {
    - unsigned int quadlen = XDR_QUADLEN(obj->len);
    - __be32 *p;
    -
    - if (xdr_stream_encode_u32(xdr, obj->len) < 0)
    - return false;
    - p = xdr_reserve_space(xdr, obj->len);
    - if (!p)
    + if (obj->len > XDR_MAX_NETOBJ)
    return false;
    - p[quadlen - 1] = 0; /* XDR pad */
    - memcpy(p, obj->data, obj->len);
    -
    - return true;
    + return xdr_stream_encode_opaque(xdr, obj->data, obj->len) > 0;
    }

    #endif /* _LOCKD_SVCXDR_H_ */
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-09-27 19:26    [W:4.021 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site