linux-ext4 - Re: [PATCH 3/9] quota: fix e2fsck to notice missing quota entries

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]

Date:	Mon, 12 May 2014 23:42:36 -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 3/9] quota: fix e2fsck to notice missing quota entries

Looks good.

On Sat, May 10, 2014 at 9:32 PM, Theodore Ts'o <tytso@....edu> wrote:
> Previously if there was a missing quota entry --- i.e., if there were
> files owned by group "eng", but there was no quota record for group
> "eng", e2fsck would not notice the missing entry.  This means that the
> usage informtion would not be properly repaired.  This is unfortunate.
> Fix this by marking each quota record in quota_dict that has a
> corresponding record on disk, and then check to see if there are any
> records in quota_dict that have not been marked as having been seen.
> In that case, we know we need to update the relevant quota inode.
>
> Signed-off-by: "Theodore Ts'o" <tytso@....edu>
> Cc: adityakali@...gle.com

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

Thanks!

> ---
>  lib/quota/mkquota.c | 17 ++++++++++++++++-
>  lib/quota/quotaio.h |  2 ++
>  2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c
> index f77e072..f5ae0e0 100644
> --- a/lib/quota/mkquota.c
> +++ b/lib/quota/mkquota.c
> @@ -458,6 +458,7 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data)
>
>         dq = get_dq(quota_dict, dquot->dq_id);
>         dq->dq_id = dquot->dq_id;
> +       dq->dq_flags |= DQF_SEEN;
>
>         print_dquot("mem", dq);
>         print_dquot("dsk", dquot);
> @@ -572,10 +573,13 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
>         ext2_filsys fs = qctx->fs;
>         struct quota_handle qh;
>         struct scan_dquots_data scan_data;
> +       struct dquot *dq;
> +       dnode_t *n;
> +       dict_t *dict = qctx->quota_dict[qtype];
>         ext2_ino_t qf_ino;
>         errcode_t err = 0;
>
> -       if (!qctx->quota_dict[qtype])
> +       if (!dict)
>                 goto out;
>
>         qf_ino = qtype == USRQUOTA ? fs->super->s_usr_quota_inum :
> @@ -595,6 +599,17 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
>                 log_err("Error scanning dquots");
>                 goto out;
>         }
> +
> +       for (n = dict_first(dict); n; n = dict_next(dict, n)) {
> +               dq = dnode_get(n);
> +               if (!dq)
> +                       continue;
> +               if ((dq->dq_flags & DQF_SEEN) == 0) {
> +                       fprintf(stderr, "[QUOTA WARNING] "
> +                               "Missing quota entry ID %d\n", dq->dq_id);
> +                       scan_data.usage_is_inconsistent = 1;
> +               }
> +       }
>         *usage_inconsistent = scan_data.usage_is_inconsistent;
>
>  out:
> diff --git a/lib/quota/quotaio.h b/lib/quota/quotaio.h
> index 1c062f1..55e6eb0 100644
> --- a/lib/quota/quotaio.h
> +++ b/lib/quota/quotaio.h
> @@ -104,6 +104,8 @@ struct dquot {
>         struct util_dqblk dq_dqb;       /* Parsed data of dquot */
>  };
>
> +#define DQF_SEEN       0x0001
> +
>  /* Structure of quotafile operations */
>  struct quotafile_ops {
>         /* Check whether quotafile is in our format */
> --
> 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