thr3ads.net - Btrfs devel - [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early

If this information is useful, please help other people find it:
Share via:

Jeff Liu

2011-Sep-13 06:06 UTC

[PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Signed-off-by: Jie Liu <jeff.liu@oracle.com>

---
  fs/btrfs/super.c |   10 ++++++++--
  1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 15634d4..16f31e1 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char 
*options, fmode_t flags,
          u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
  {
      substring_t args[MAX_OPT_ARGS];
-    char *opts, *orig, *p;
+    char *device_name, *opts, *orig, *p;
      int error = 0;
      int intarg;

@@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char 
*options, fmode_t flags,
              }
              break;
          case Opt_device:
-            error = btrfs_scan_one_device(match_strdup(&args[0]),
+            device_name = match_strdup(&args[0]);
+            if (!device_name) {
+                error = -ENOMEM;
+                goto out_free_opts;
+            }
+            error = btrfs_scan_one_device(device_name,
                      flags, holder, fs_devices);
+            kfree(device_name);
              if (error)
                  goto out_free_opts;
              break;
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Li Zefan

2011-Sep-14 05:40 UTC

head link

Re: [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

14:06, Jeff Liu wrote:> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> 
> ---
>  fs/btrfs/super.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 15634d4..16f31e1 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
>          u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
>  {
>      substring_t args[MAX_OPT_ARGS];
> -    char *opts, *orig, *p;
> +    char *device_name, *opts, *orig, *p;
Seems your email client replaced tabs with spaces.

Please read Documentation/email-clients.txt
>      int error = 0;
>      int intarg;
> 
> @@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
>              }
>              break;
>          case Opt_device:
> -            error = btrfs_scan_one_device(match_strdup(&args[0]),
> +            device_name = match_strdup(&args[0]);
> +            if (!device_name) {
> +                error = -ENOMEM;
> +                goto out_free_opts;
> +            }
> +            error = btrfs_scan_one_device(device_name,
>                      flags, holder, fs_devices);
> +            kfree(device_name);
>              if (error)
>                  goto out_free_opts;
>              break;--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Jeff Liu

2011-Sep-14 06:11 UTC

head link

Re: [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

On 09/14/2011 01:40 PM, Li Zefan wrote:
> 14:06, Jeff Liu wrote:
>> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
>>
>> ---
>>  fs/btrfs/super.c |   10 ++++++++--
>>  1 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
>> index 15634d4..16f31e1 100644
>> --- a/fs/btrfs/super.c
>> +++ b/fs/btrfs/super.c
>> @@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
>>          u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
>>  {
>>      substring_t args[MAX_OPT_ARGS];
>> -    char *opts, *orig, *p;
>> +    char *device_name, *opts, *orig, *p;
> 
> Seems your email client replaced tabs with spaces.
Fixed, thank you.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>

---
 fs/btrfs/super.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 15634d4..16f31e1 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
 		u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
 {
 	substring_t args[MAX_OPT_ARGS];
-	char *opts, *orig, *p;
+	char *device_name, *opts, *orig, *p;
 	int error = 0;
 	int intarg;

@@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
 			}
 			break;
 		case Opt_device:
-			error = btrfs_scan_one_device(match_strdup(&args[0]),
+			device_name = match_strdup(&args[0]);
+			if (!device_name) {
+				error = -ENOMEM;
+				goto out_free_opts;
+			}
+			error = btrfs_scan_one_device(device_name,
 					flags, holder, fs_devices);
+			kfree(device_name);
 			if (error)
 				goto out_free_opts;
 			break;
-- 
1.7.4.1

> 
> Please read Documentation/email-clients.txt
> 
>>      int error = 0;
>>      int intarg;
>>
>> @@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
>>              }
>>              break;
>>          case Opt_device:
>> -            error = btrfs_scan_one_device(match_strdup(&args[0]),
>> +            device_name = match_strdup(&args[0]);
>> +            if (!device_name) {
>> +                error = -ENOMEM;
>> +                goto out_free_opts;
>> +            }
>> +            error = btrfs_scan_one_device(device_name,
>>                      flags, holder, fs_devices);
>> +            kfree(device_name);
>>              if (error)
>>                  goto out_free_opts;
>>              break;
> --
> To unsubscribe from this list: send the line "unsubscribe
linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

David Sterba

2011-Sep-15 12:05 UTC

head link

Re: [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

On Wed, Sep 14, 2011 at 02:11:21PM +0800, Jeff Liu
wrote:> On 09/14/2011 01:40 PM, Li Zefan wrote:
> 
> > 14:06, Jeff Liu wrote:
> >> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> >>
> >> ---
> >>  fs/btrfs/super.c |   10 ++++++++--
> >>  1 files changed, 8 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> >> index 15634d4..16f31e1 100644
> >> --- a/fs/btrfs/super.c
> >> +++ b/fs/btrfs/super.c
> >> @@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const
char *options, fmode_t flags,
> >>          u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
> >>  {
> >>      substring_t args[MAX_OPT_ARGS];
> >> -    char *opts, *orig, *p;
> >> +    char *device_name, *opts, *orig, *p;
> > 
> > Seems your email client replaced tabs with spaces.
> 
> Fixed, thank you.
> 
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> 
> ---
>  fs/btrfs/super.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 15634d4..16f31e1 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char
> *options, fmode_t flags,  ^^^^^^^^^^^^^^^^^^^^^^^^

long lines are still getting wrapped.
>  		u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
>  {
>  	substring_t args[MAX_OPT_ARGS];
> -	char *opts, *orig, *p;
> +	char *device_name, *opts, *orig, *p;
>  	int error = 0;
>  	int intarg;
> 
> @@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char
> *options, fmode_t flags,  ^^^^^^^^^^^^^^^^^^^^^^^^
>  			}
>  			break;
>  		case Opt_device:
> -			error = btrfs_scan_one_device(match_strdup(&args[0]),
> +			device_name = match_strdup(&args[0]);
> +			if (!device_name) {
> +				error = -ENOMEM;
> +				goto out_free_opts;
> +			}
> +			error = btrfs_scan_one_device(device_name,
>  					flags, holder, fs_devices);
> +			kfree(device_name);
>  			if (error)
>  				goto out_free_opts;
>  			break;
> -- 
> 1.7.4.1
and you do not need to keep unrelated replies and signatures (like the
following quoted text). Just send the patch again with proper changelog
and add a version tag eg

[PATCH v2] btrfs: ...

It''s really annoying to hand fix corrupted patches from mailinglist, 
> 
> 
> > 
> > Please read Documentation/email-clients.txt
> > 
> >>      int error = 0;
> >>      int intarg;
> >>
> >> @@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const
char *options, fmode_t flags,
> >>              }
> >>              break;
> >>          case Opt_device:
> >> -            error =
btrfs_scan_one_device(match_strdup(&args[0]),
> >> +            device_name = match_strdup(&args[0]);
> >> +            if (!device_name) {
> >> +                error = -ENOMEM;
> >> +                goto out_free_opts;
> >> +            }
> >> +            error = btrfs_scan_one_device(device_name,
> >>                      flags, holder, fs_devices);
> >> +            kfree(device_name);
> >>              if (error)
> >>                  goto out_free_opts;
> >>              break;
> > --
> > To unsubscribe from this list: send the line "unsubscribe
linux-btrfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe
linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Jeff Liu

2011-Sep-15 15:01 UTC

head link

[PATCH V2] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Signed-off-by: Jie Liu <jeff.liu@oracle.com>

---
 fs/btrfs/super.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 15634d4..16f31e1 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char *options,
fmode_t flags,
 		u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
 {
 	substring_t args[MAX_OPT_ARGS];
-	char *opts, *orig, *p;
+	char *device_name, *opts, *orig, *p;
 	int error = 0;
 	int intarg;
 
@@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char *options,
fmode_t flags,
 			}
 			break;
 		case Opt_device:
-			error = btrfs_scan_one_device(match_strdup(&args[0]),
+			device_name = match_strdup(&args[0]);
+			if (!device_name) {
+				error = -ENOMEM;
+				goto out_free_opts;
+			}
+			error = btrfs_scan_one_device(device_name,
 					flags, holder, fs_devices);
+			kfree(device_name);
 			if (error)
 				goto out_free_opts;
 			break;
-- 
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

David Sterba

2011-Sep-15 18:07 UTC

head link

Re: [PATCH V2] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

On Thu, Sep 15, 2011 at 11:01:28PM +0800, Jeff Liu
wrote:> Signed-off-by: Jie Liu <jeff.liu@oracle.com>Reviewed-by: David Sterba <dsterba@suse.cz>
> 
> ---
>  fs/btrfs/super.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 15634d4..16f31e1 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -406,7 +406,7 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
>  		u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
>  {
>  	substring_t args[MAX_OPT_ARGS];
> -	char *opts, *orig, *p;
> +	char *device_name, *opts, *orig, *p;
>  	int error = 0;
>  	int intarg;
>  
> @@ -457,8 +457,14 @@ static int btrfs_parse_early_options(const char
*options, fmode_t flags,
>  			}
>  			break;
>  		case Opt_device:
> -			error = btrfs_scan_one_device(match_strdup(&args[0]),
> +			device_name = match_strdup(&args[0]);
> +			if (!device_name) {
> +				error = -ENOMEM;
> +				goto out_free_opts;
> +			}
> +			error = btrfs_scan_one_device(device_name,
>  					flags, holder, fs_devices);
> +			kfree(device_name);
>  			if (error)
>  				goto out_free_opts;
>  			break;
> -- 
> 1.7.4.1
> --
> To unsubscribe from this list: send the line "unsubscribe
linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reasonably Related Threads

Search for more maybe matching threads

Btrfs devel - Sep 2011 - [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

[PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Re: [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Re: [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Re: [PATCH] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

[PATCH V2] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Re: [PATCH V2] btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Reasonably Related Threads