* [PATCH] nfs: fix null checking in nfs_get_option_str()
@ 2013-01-04 8:22 Xi Wang
2013-01-04 15:55 ` Myklebust, Trond
0 siblings, 1 reply; 2+ messages in thread
From: Xi Wang @ 2013-01-04 8:22 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-nfs, linux-kernel, Xi Wang, stable
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
---
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)
--
1.7.10.4
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] nfs: fix null checking in nfs_get_option_str()
2013-01-04 8:22 [PATCH] nfs: fix null checking in nfs_get_option_str() Xi Wang
@ 2013-01-04 15:55 ` Myklebust, Trond
0 siblings, 0 replies; 2+ messages in thread
From: Myklebust, Trond @ 2013-01-04 15:55 UTC (permalink / raw)
To: Xi Wang; +Cc: linux-nfs, linux-kernel, stable
On Fri, 2013-01-04 at 03:22 -0500, Xi Wang wrote:
> 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
> ---
> 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)
Thank you! Applied to the bugfixes branch.
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-04 15:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-04 8:22 [PATCH] nfs: fix null checking in nfs_get_option_str() Xi Wang
2013-01-04 15:55 ` Myklebust, Trond
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome