| From e25fbe380c4e3c09afa98bcdcd9d3921443adab8 Mon Sep 17 00:00:00 2001 |
| From: Xi Wang <xi.wang@gmail.com> |
| Date: Fri, 4 Jan 2013 03:22:57 -0500 |
| Subject: nfs: fix null checking in nfs_get_option_str() |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/super.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/nfs/super.c |
| +++ b/fs/nfs/super.c |
| @@ -1150,7 +1150,7 @@ static int nfs_get_option_str(substring_ |
| { |
| kfree(*option); |
| *option = match_strdup(args); |
| - return !option; |
| + return !*option; |
| } |
| |
| static int nfs_get_option_ul(substring_t args[], unsigned long *option) |
