lkml.org 
[lkml]   [2013]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 25/49] nfs: fix null checking in nfs_get_option_str()
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Xi Wang <xi.wang@gmail.com>

    commit e25fbe380c4e3c09afa98bcdcd9d3921443adab8 upstream.

    The following null pointer check is broken.

    *option = match_strdup(args);
    return !option;

    The pointer `option' must be non-null, and thus `!option' is always false.
    Use `!*option' instead.

    The bug was introduced in commit c5cb09b6f8 ("Cleanup: Factor out some
    cut-and-paste code.").

    Signed-off-by: Xi Wang <xi.wang@gmail.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/nfs/super.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/nfs/super.c b/fs/nfs/super.c
    index c25cadf8..2e7e8c8 100644
    --- a/fs/nfs/super.c
    +++ b/fs/nfs/super.c
    @@ -1152,7 +1152,7 @@ static int nfs_get_option_str(substring_t args[], char **option)
    {
    kfree(*option);
    *option = match_strdup(args);
    - return !option;
    + return !*option;
    }

    static int nfs_get_option_ul(substring_t args[], unsigned long *option)



    \
     
     \ /
      Last update: 2013-01-13 19:41    [W:4.225 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site