* [PATCH] ext4: Fix memory leak when quota options are specified multiple times
@ 2013-01-20 10:11 Chen Gang
2013-01-21 10:31 ` Jan Kara
0 siblings, 1 reply; 6+ messages in thread
From: Chen Gang @ 2013-01-20 10:11 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: Jan Kara, akpm, linux-ext4
When usrjquota or grpjquota mount options are specified several times,
we leak memory storing the names. Free the memory correctly.
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Cc: Jan Kara <jack@suse.cz>
---
fs/ext4/super.c | 48 ++++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index c014edd..a4a8ecc 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1351,21 +1351,25 @@ static int set_qf_name(struct super_block *sb, int qtype, substring_t *args)
"Not enough memory for storing quotafile name");
return -1;
}
- if (sbi->s_qf_names[qtype] &&
- strcmp(sbi->s_qf_names[qtype], qname)) {
- ext4_msg(sb, KERN_ERR,
- "%s quota file already specified", QTYPE2NAME(qtype));
+ if (sbi->s_qf_names[qtype]) {
+ int ret = 1;
+
+ if (strcmp(sbi->s_qf_names[qtype], qname)) {
+ ext4_msg(sb, KERN_ERR,
+ "%s quota file already specified",
+ QTYPE2NAME(qtype));
+ ret = -1;
+ }
kfree(qname);
- return -1;
+ return ret;
}
- sbi->s_qf_names[qtype] = qname;
- if (strchr(sbi->s_qf_names[qtype], '/')) {
+ if (strchr(qname, '/')) {
ext4_msg(sb, KERN_ERR,
"quotafile must be on filesystem root");
- kfree(sbi->s_qf_names[qtype]);
- sbi->s_qf_names[qtype] = NULL;
+ kfree(qname);
return -1;
}
+ sbi->s_qf_names[qtype] = qname;
set_opt(sb, QUOTA);
return 1;
}
@@ -1381,10 +1385,7 @@ static int clear_qf_name(struct super_block *sb, int qtype)
" when quota turned on");
return -1;
}
- /*
- * The space will be released later when all options are confirmed
- * to be correct
- */
+ kfree(sbi->s_qf_names[qtype]);
sbi->s_qf_names[qtype] = NULL;
return 1;
}
@@ -4605,7 +4606,18 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
#ifdef CONFIG_QUOTA
old_opts.s_jquota_fmt = sbi->s_jquota_fmt;
for (i = 0; i < MAXQUOTAS; i++)
- old_opts.s_qf_names[i] = sbi->s_qf_names[i];
+ if (sbi->s_qf_names[i]) {
+ old_opts.s_qf_names[i] = kstrdup(sbi->s_qf_names[i],
+ GFP_KERNEL);
+ if (!old_opts.s_qf_names[i]) {
+ int j;
+
+ for (j = 0; j < i; j++)
+ kfree(old_opts.s_qf_names[j]);
+ return -ENOMEM;
+ }
+ } else
+ old_opts.s_qf_names[i] = NULL;
#endif
if (sbi->s_journal && sbi->s_journal->j_task->io_context)
journal_ioprio = sbi->s_journal->j_task->io_context->ioprio;
@@ -4738,9 +4750,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
#ifdef CONFIG_QUOTA
/* Release old quota file names */
for (i = 0; i < MAXQUOTAS; i++)
- if (old_opts.s_qf_names[i] &&
- old_opts.s_qf_names[i] != sbi->s_qf_names[i])
- kfree(old_opts.s_qf_names[i]);
+ kfree(old_opts.s_qf_names[i]);
if (enable_quota) {
if (sb_any_quota_suspended(sb))
dquot_resume(sb, -1);
@@ -4769,9 +4779,7 @@ restore_opts:
#ifdef CONFIG_QUOTA
sbi->s_jquota_fmt = old_opts.s_jquota_fmt;
for (i = 0; i < MAXQUOTAS; i++) {
- if (sbi->s_qf_names[i] &&
- old_opts.s_qf_names[i] != sbi->s_qf_names[i])
- kfree(sbi->s_qf_names[i]);
+ kfree(sbi->s_qf_names[i]);
sbi->s_qf_names[i] = old_opts.s_qf_names[i];
}
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ext4: Fix memory leak when quota options are specified multiple times
2013-01-20 10:11 [PATCH] ext4: Fix memory leak when quota options are specified multiple times Chen Gang
@ 2013-01-21 10:31 ` Jan Kara
2013-01-21 10:59 ` Chen Gang
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kara @ 2013-01-21 10:31 UTC (permalink / raw)
To: Chen Gang; +Cc: Theodore Ts'o, Jan Kara, akpm, linux-ext4
On Sun 20-01-13 18:11:36, Chen Gang wrote:
>
> When usrjquota or grpjquota mount options are specified several times,
> we leak memory storing the names. Free the memory correctly.
The port looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> Cc: Jan Kara <jack@suse.cz>
> ---
> fs/ext4/super.c | 48 ++++++++++++++++++++++++++++--------------------
> 1 file changed, 28 insertions(+), 20 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index c014edd..a4a8ecc 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -1351,21 +1351,25 @@ static int set_qf_name(struct super_block *sb, int qtype, substring_t *args)
> "Not enough memory for storing quotafile name");
> return -1;
> }
> - if (sbi->s_qf_names[qtype] &&
> - strcmp(sbi->s_qf_names[qtype], qname)) {
> - ext4_msg(sb, KERN_ERR,
> - "%s quota file already specified", QTYPE2NAME(qtype));
> + if (sbi->s_qf_names[qtype]) {
> + int ret = 1;
> +
> + if (strcmp(sbi->s_qf_names[qtype], qname)) {
> + ext4_msg(sb, KERN_ERR,
> + "%s quota file already specified",
> + QTYPE2NAME(qtype));
> + ret = -1;
> + }
> kfree(qname);
> - return -1;
> + return ret;
> }
> - sbi->s_qf_names[qtype] = qname;
> - if (strchr(sbi->s_qf_names[qtype], '/')) {
> + if (strchr(qname, '/')) {
> ext4_msg(sb, KERN_ERR,
> "quotafile must be on filesystem root");
> - kfree(sbi->s_qf_names[qtype]);
> - sbi->s_qf_names[qtype] = NULL;
> + kfree(qname);
> return -1;
> }
> + sbi->s_qf_names[qtype] = qname;
> set_opt(sb, QUOTA);
> return 1;
> }
> @@ -1381,10 +1385,7 @@ static int clear_qf_name(struct super_block *sb, int qtype)
> " when quota turned on");
> return -1;
> }
> - /*
> - * The space will be released later when all options are confirmed
> - * to be correct
> - */
> + kfree(sbi->s_qf_names[qtype]);
> sbi->s_qf_names[qtype] = NULL;
> return 1;
> }
> @@ -4605,7 +4606,18 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
> #ifdef CONFIG_QUOTA
> old_opts.s_jquota_fmt = sbi->s_jquota_fmt;
> for (i = 0; i < MAXQUOTAS; i++)
> - old_opts.s_qf_names[i] = sbi->s_qf_names[i];
> + if (sbi->s_qf_names[i]) {
> + old_opts.s_qf_names[i] = kstrdup(sbi->s_qf_names[i],
> + GFP_KERNEL);
> + if (!old_opts.s_qf_names[i]) {
> + int j;
> +
> + for (j = 0; j < i; j++)
> + kfree(old_opts.s_qf_names[j]);
> + return -ENOMEM;
> + }
> + } else
> + old_opts.s_qf_names[i] = NULL;
> #endif
> if (sbi->s_journal && sbi->s_journal->j_task->io_context)
> journal_ioprio = sbi->s_journal->j_task->io_context->ioprio;
> @@ -4738,9 +4750,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
> #ifdef CONFIG_QUOTA
> /* Release old quota file names */
> for (i = 0; i < MAXQUOTAS; i++)
> - if (old_opts.s_qf_names[i] &&
> - old_opts.s_qf_names[i] != sbi->s_qf_names[i])
> - kfree(old_opts.s_qf_names[i]);
> + kfree(old_opts.s_qf_names[i]);
> if (enable_quota) {
> if (sb_any_quota_suspended(sb))
> dquot_resume(sb, -1);
> @@ -4769,9 +4779,7 @@ restore_opts:
> #ifdef CONFIG_QUOTA
> sbi->s_jquota_fmt = old_opts.s_jquota_fmt;
> for (i = 0; i < MAXQUOTAS; i++) {
> - if (sbi->s_qf_names[i] &&
> - old_opts.s_qf_names[i] != sbi->s_qf_names[i])
> - kfree(sbi->s_qf_names[i]);
> + kfree(sbi->s_qf_names[i]);
> sbi->s_qf_names[i] = old_opts.s_qf_names[i];
> }
> #endif
> --
> 1.7.10.4
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ext4: Fix memory leak when quota options are specified multiple times
2013-01-21 10:31 ` Jan Kara
@ 2013-01-21 10:59 ` Chen Gang
2013-01-21 11:05 ` Jan Kara
0 siblings, 1 reply; 6+ messages in thread
From: Chen Gang @ 2013-01-21 10:59 UTC (permalink / raw)
To: Jan Kara; +Cc: Theodore Ts'o, akpm, linux-ext4
于 2013年01月21日 18:31, Jan Kara 写道:
> The port looks good. You can add:
> Reviewed-by: Jan Kara <jack@suse.cz>
does it mean:
if the applier also think this patch is ok, he will add you as
Reviewed-by (it is also just what my willing) ?
and for me, need do nothing for it, now ?
thanks.
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ext4: Fix memory leak when quota options are specified multiple times
2013-01-21 10:59 ` Chen Gang
@ 2013-01-21 11:05 ` Jan Kara
2013-01-21 11:07 ` Chen Gang
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kara @ 2013-01-21 11:05 UTC (permalink / raw)
To: Chen Gang; +Cc: Jan Kara, Theodore Ts'o, akpm, linux-ext4
On Mon 21-01-13 18:59:45, Chen Gang wrote:
> 于 2013年01月21日 18:31, Jan Kara 写道:
> > The port looks good. You can add:
> > Reviewed-by: Jan Kara <jack@suse.cz>
>
> does it mean:
> if the applier also think this patch is ok, he will add you as
> Reviewed-by (it is also just what my willing) ?
Yes.
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ext4: Fix memory leak when quota options are specified multiple times
2013-01-21 11:05 ` Jan Kara
@ 2013-01-21 11:07 ` Chen Gang
2013-01-25 3:49 ` Theodore Ts'o
0 siblings, 1 reply; 6+ messages in thread
From: Chen Gang @ 2013-01-21 11:07 UTC (permalink / raw)
To: Jan Kara; +Cc: Theodore Ts'o, akpm, linux-ext4
于 2013年01月21日 19:05, Jan Kara 写道:
> On Mon 21-01-13 18:59:45, Chen Gang wrote:
>> 于 2013年01月21日 18:31, Jan Kara 写道:
>>> The port looks good. You can add:
>>> Reviewed-by: Jan Kara <jack@suse.cz>
>>
>> does it mean:
>> if the applier also think this patch is ok, he will add you as
>> Reviewed-by (it is also just what my willing) ?
> Yes.
>
> Honza
>
thank you.
:-)
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-25 3:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-20 10:11 [PATCH] ext4: Fix memory leak when quota options are specified multiple times Chen Gang
2013-01-21 10:31 ` Jan Kara
2013-01-21 10:59 ` Chen Gang
2013-01-21 11:05 ` Jan Kara
2013-01-21 11:07 ` Chen Gang
2013-01-25 3:49 ` Theodore Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).