From: Xi Wang <xi.wang@gmail.com>
Date: Fri, 4 Jan 2013 08:22:57 +0000 (-0500)
Subject: nfs: fix null checking in nfs_get_option_str()
X-Git-Tag: MMI-PSA29.97-13-9~15222^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e25fbe380c4e3c09afa98bcdcd9d3921443adab8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

nfs: fix null checking in nfs_get_option_str()

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>
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index c25cadf8f8c4..2e7e8c878e5d 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)