lkml.org 
[lkml]   [2012]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 62/62] lockd: fix the endianness bug
    3.3-stable review patch.  If anyone has any objections, please let me know.

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

    From: Al Viro <viro@zeniv.linux.org.uk>

    commit e847469bf77a1d339274074ed068d461f0c872bc upstream.

    comparing be32 values for < is not doing the right thing...

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/lockd/clnt4xdr.c | 2 +-
    fs/lockd/clntxdr.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/fs/lockd/clnt4xdr.c
    +++ b/fs/lockd/clnt4xdr.c
    @@ -241,7 +241,7 @@ static int decode_nlm4_stat(struct xdr_s
    p = xdr_inline_decode(xdr, 4);
    if (unlikely(p == NULL))
    goto out_overflow;
    - if (unlikely(*p > nlm4_failed))
    + if (unlikely(ntohl(*p) > ntohl(nlm4_failed)))
    goto out_bad_xdr;
    *stat = *p;
    return 0;
    --- a/fs/lockd/clntxdr.c
    +++ b/fs/lockd/clntxdr.c
    @@ -236,7 +236,7 @@ static int decode_nlm_stat(struct xdr_st
    p = xdr_inline_decode(xdr, 4);
    if (unlikely(p == NULL))
    goto out_overflow;
    - if (unlikely(*p > nlm_lck_denied_grace_period))
    + if (unlikely(ntohl(*p) > ntohl(nlm_lck_denied_grace_period)))
    goto out_enum;
    *stat = *p;
    return 0;



    \
     
     \ /
      Last update: 2012-04-25 00:51    [W:4.510 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site