nfs: fix null checking in nfs_get_option_str()

xiw · Trond Myklebust · commit e25fbe380c4e · 2013-01-04T10:54:43.000-05:00
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 c5cb09b ("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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1152,7 +1152,7 @@ static int nfs_get_option_str(substring_t args[], char **option)`
`1152`	`1152`	`{`
`1153`	`1153`	`kfree(*option);`
`1154`	`1154`	`*option = match_strdup(args);`
`1155`		`- return !option;`
	`1155`	`+ return !*option;`
`1156`	`1156`	`}`
`1157`	`1157`
`1158`	`1158`	`static int nfs_get_option_ul(substring_t args[], unsigned long *option)`