Commit e25fbe38 authored Jan 04, 2013 by Xi Wang Committed by Trond Myklebust Jan 04, 2013

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 c5cb09b6 ("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>

parent 39e88fcf

fs/nfs/super.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1152,7 +1152,7 @@ static int nfs_get_option_str(substring_t args[], char **option)
	{		{
	kfree(*option);		kfree(*option);
	*option = match_strdup(args);		*option = match_strdup(args);
	return !option;		return !*option;
	}		}

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