linux-ext4 - Re: [PATCH 4/9] quota: fix memory leak in quota_compare_and

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAGr1F2FwRLuAtdrJsU+BHaMF05+rihqYW2MfmPCYj-oMm0McOA@mail.gmail.com>
Date:	Mon, 12 May 2014 23:48:42 -0700
From:	Aditya Kali <adityakali@...gle.com>
To:	"Theodore Ts'o" <tytso@....edu>
Cc:	Ext4 Developers List <linux-ext4@...r.kernel.org>
Subject: Re: [PATCH 4/9] quota: fix memory leak in quota_compare_and_update()

On Sat, May 10, 2014 at 9:32 PM, Theodore Ts'o <tytso@....edu> wrote:
> The quota_handle wasn't getting closed in quota_compare_and_update().
> Fix this, and also make sure that quota_file_close() doesn't
> unnecessarily modify the quota inode if it's not necessary.  Otherwise
> e2fsck will claim that the file system is modified when it didn't need
> to be.
>
> Signed-off-by: "Theodore Ts'o" <tytso@....edu>
> Cc: adityakali@...gle.com

Reviewed-by: Aditya Kali <adityakali@...gle.com>

Thanks!

> ---
>  lib/quota/mkquota.c | 9 ++++++++-
>  lib/quota/quotaio.c | 9 +++++++--
>  2 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c
> index f5ae0e0..ed10890 100644
> --- a/lib/quota/mkquota.c
> +++ b/lib/quota/mkquota.c
> @@ -597,7 +597,7 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
>         err = qh.qh_ops->scan_dquots(&qh, scan_dquots_callback, &scan_data);
>         if (err) {
>                 log_err("Error scanning dquots");
> -               goto out;
> +               goto out_close_qh;
>         }
>
>         for (n = dict_first(dict); n; n = dict_next(dict, n)) {
> @@ -612,6 +612,13 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
>         }
>         *usage_inconsistent = scan_data.usage_is_inconsistent;
>
> +out_close_qh:
> +       err = quota_file_close(&qh);
> +       if (err) {
> +               log_err("Cannot close quotafile: %s", error_message(errno));
> +               if (qh.qh_qf.e2_file)
> +                       ext2fs_file_close(qh.qh_qf.e2_file);
> +       }
>  out:
>         return err;
>  }
> diff --git a/lib/quota/quotaio.c b/lib/quota/quotaio.c
> index 7e98ed7..a95a1f9 100644
> --- a/lib/quota/quotaio.c
> +++ b/lib/quota/quotaio.c
> @@ -356,9 +356,14 @@ errcode_t quota_file_close(struct quota_handle *h)
>         if (h->qh_ops->end_io && h->qh_ops->end_io(h) < 0)
>                 return -1;
>         if (h->qh_qf.e2_file) {
> +               __u64 new_size, size;
> +
> +               new_size = compute_inode_size(h->qh_qf.fs, h->qh_qf.ino);
>                 ext2fs_file_flush(h->qh_qf.e2_file);
> -               ext2fs_file_set_size2(h->qh_qf.e2_file,
> -                       compute_inode_size(h->qh_qf.fs, h->qh_qf.ino));
> +               if (ext2fs_file_get_lsize(h->qh_qf.e2_file, &size))
> +                       new_size = 0;
> +               if (size != new_size)
> +                       ext2fs_file_set_size2(h->qh_qf.e2_file, new_size);
>                 ext2fs_file_close(h->qh_qf.e2_file);
>         }
>
> --
> 1.9.0
>



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