* [PATCH] fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
@ 2013-01-23 0:20 Cong Ding
2013-01-23 1:36 ` Jeff Layton
0 siblings, 1 reply; 4+ messages in thread
From: Cong Ding @ 2013-01-23 0:20 UTC (permalink / raw)
To: Steve French, linux-cifs, samba-technical, linux-kernel; +Cc: Cong Ding
When it goes to error through line 144, the memory allocated to *devname is
not freed, and the caller doesn't free it either in line 250. So we free the
memroy of *devname in function cifs_compose_mount_options() when it goes to
error.
Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
fs/cifs/cifs_dfs_ref.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index ce5cbd7..210fce2 100644
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -226,6 +226,8 @@ compose_mount_options_out:
compose_mount_options_err:
kfree(mountdata);
mountdata = ERR_PTR(rc);
+ kfree(*devname);
+ *devname = NULL;
goto compose_mount_options_out;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
2013-01-23 0:20 [PATCH] fs/cifs/cifs_dfs_ref.c: fix potential memory leakage Cong Ding
@ 2013-01-23 1:36 ` Jeff Layton
2013-01-23 5:59 ` Steve French
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Layton @ 2013-01-23 1:36 UTC (permalink / raw)
To: Cong Ding; +Cc: Steve French, linux-cifs, samba-technical, linux-kernel
On Tue, 22 Jan 2013 19:20:58 -0500
Cong Ding <dinggnu@gmail.com> wrote:
> When it goes to error through line 144, the memory allocated to *devname is
> not freed, and the caller doesn't free it either in line 250. So we free the
> memroy of *devname in function cifs_compose_mount_options() when it goes to
> error.
>
> Signed-off-by: Cong Ding <dinggnu@gmail.com>
> ---
> fs/cifs/cifs_dfs_ref.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
> index ce5cbd7..210fce2 100644
> --- a/fs/cifs/cifs_dfs_ref.c
> +++ b/fs/cifs/cifs_dfs_ref.c
> @@ -226,6 +226,8 @@ compose_mount_options_out:
> compose_mount_options_err:
> kfree(mountdata);
> mountdata = ERR_PTR(rc);
> + kfree(*devname);
> + *devname = NULL;
> goto compose_mount_options_out;
> }
>
Nice catch. Looks correct to me. Should this also go to stable?
Reviewed-by: Jeff Layton <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
2013-01-23 1:36 ` Jeff Layton
@ 2013-01-23 5:59 ` Steve French
2013-01-23 6:00 ` Steve French
0 siblings, 1 reply; 4+ messages in thread
From: Steve French @ 2013-01-23 5:59 UTC (permalink / raw)
To: Jeff Layton
Cc: Cong Ding, Steve French, linux-cifs, samba-technical,
linux-kernel
merged into cifs-2.6.git
On Tue, Jan 22, 2013 at 7:36 PM, Jeff Layton <jlayton@redhat.com> wrote:
> On Tue, 22 Jan 2013 19:20:58 -0500
> Cong Ding <dinggnu@gmail.com> wrote:
>
>> When it goes to error through line 144, the memory allocated to *devname is
>> not freed, and the caller doesn't free it either in line 250. So we free the
>> memroy of *devname in function cifs_compose_mount_options() when it goes to
>> error.
>>
>> Signed-off-by: Cong Ding <dinggnu@gmail.com>
>> ---
>> fs/cifs/cifs_dfs_ref.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
>> index ce5cbd7..210fce2 100644
>> --- a/fs/cifs/cifs_dfs_ref.c
>> +++ b/fs/cifs/cifs_dfs_ref.c
>> @@ -226,6 +226,8 @@ compose_mount_options_out:
>> compose_mount_options_err:
>> kfree(mountdata);
>> mountdata = ERR_PTR(rc);
>> + kfree(*devname);
>> + *devname = NULL;
>> goto compose_mount_options_out;
>> }
>>
>
> Nice catch. Looks correct to me. Should this also go to stable?
>
> Reviewed-by: Jeff Layton <jlayton@redhat.com>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-23 6:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 0:20 [PATCH] fs/cifs/cifs_dfs_ref.c: fix potential memory leakage Cong Ding
2013-01-23 1:36 ` Jeff Layton
2013-01-23 5:59 ` Steve French
2013-01-23 6:00 ` Steve French
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox