]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
nfs: fix null checking in nfs_get_option_str()
authorXi Wang <xi.wang@gmail.com>
Fri, 4 Jan 2013 08:22:57 +0000 (03:22 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 16 Jan 2013 01:13:19 +0000 (01:13 +0000)
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

index 81503449f78d8c7418543483342817ee28d55f5a..19438987bbe418294568eeaf1ad7a12c08ebcd14 100644 (file)
@@ -1057,7 +1057,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)