Messages in this thread Patch in this message | | | Date | Sun, 13 Jan 2013 17:43:20 +0000 | From | Ben Hutchings <> | Subject | [ 25/49] nfs: fix null checking in nfs_get_option_str() |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xi Wang <xi.wang@gmail.com>
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index c25cadf8..2e7e8c8 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)
| |