summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorXi Wang <xi.wang@gmail.com>2013-01-04 03:22:57 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-11 09:03:38 -0800
commit31c4e8cd42eb2f6aedccd13670e113d2ca1db39e (patch)
tree6f0ac9410a4a001c60006341ce8b3e8280191d36 /fs
parentd6e0c42ccbb489d73ebc3973583474257a028d66 (diff)
downloadlwn-31c4e8cd42eb2f6aedccd13670e113d2ca1db39e.tar.gz
lwn-31c4e8cd42eb2f6aedccd13670e113d2ca1db39e.zip
nfs: fix null checking in nfs_get_option_str()
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 23f02232a51d..a5b24197f253 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1052,7 +1052,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)