lkml.org 
[lkml]   [2013]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 053/102] svcrpc: fix gss-proxy xdr decoding oops
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "J. Bruce Fields" <bfields@redhat.com>

    commit dc43376c26cef74226174a2394f37f2a3f8a8639 upstream.

    Uninitialized stack data was being used as the destination for memcpy's.

    Longer term we'll just delete some of this code; all we're doing is
    skipping over xdr that we don't care about.

    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sunrpc/auth_gss/gss_rpc_xdr.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
    +++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
    @@ -430,7 +430,7 @@ static int dummy_enc_nameattr_array(stru
    static int dummy_dec_nameattr_array(struct xdr_stream *xdr,
    struct gssx_name_attr_array *naa)
    {
    - struct gssx_name_attr dummy;
    + struct gssx_name_attr dummy = { .attr = {.len = 0} };
    u32 count, i;
    __be32 *p;

    @@ -493,12 +493,13 @@ static int gssx_enc_name(struct xdr_stre
    return err;
    }

    +
    static int gssx_dec_name(struct xdr_stream *xdr,
    struct gssx_name *name)
    {
    - struct xdr_netobj dummy_netobj;
    - struct gssx_name_attr_array dummy_name_attr_array;
    - struct gssx_option_array dummy_option_array;
    + struct xdr_netobj dummy_netobj = { .len = 0 };
    + struct gssx_name_attr_array dummy_name_attr_array = { .count = 0 };
    + struct gssx_option_array dummy_option_array = { .count = 0 };
    int err;

    /* name->display_name */



    \
     
     \ /
      Last update: 2013-08-09 05:01    [W:5.502 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site