[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130408164622.284f48c65341396aa8dbd220@linux-foundation.org>
Date: Mon, 8 Apr 2013 16:46:22 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Richard Guy Briggs <rgb@...hat.com>
Cc: linux-kernel@...r.kernel.org, linux-audit@...hat.com,
Eric Paris <eparis@...hat.com>,
Al Viro <viro@...iv.linux.org.uk>,
"Eric W. Biederman" <ebiederm@...ssion.com>
Subject: Re: [PATCH] [BZ905179] audit: omit check for uid and gid validity
in audit rules and data
On Wed, 20 Mar 2013 15:18:17 -0400 Richard Guy Briggs <rgb@...hat.com> wrote:
> audit rule additions containing "-F auid!=4294967295" were failing with EINVAL.
>
> UID_INVALID (and GID_INVALID) is actually a valid uid (gid) for setting and
> testing against audit rules. Remove the check for invalid uid and gid when
> parsing rules and data for logging.
>
> Revert part of ca57ec0f00c3f139c41bf6b0a5b9bcc95bbb2ad7 (2012-09-11) to fix
> this.
Eric, can you please take a look?
> Signed-off-by: Richard Guy Briggs <rgb@...hat.com>
> ---
> kernel/auditfilter.c | 12 ------------
> 1 files changed, 0 insertions(+), 12 deletions(-)
>
> diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
> index f9fc54b..457ee39 100644
> --- a/kernel/auditfilter.c
> +++ b/kernel/auditfilter.c
> @@ -360,10 +360,7 @@ static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
> /* bit ops not implemented for uid comparisons */
> if (f->op == Audit_bitmask || f->op == Audit_bittest)
> goto exit_free;
> -
> f->uid = make_kuid(current_user_ns(), f->val);
> - if (!uid_valid(f->uid))
> - goto exit_free;
It concerns me that map_id_down() can return -1 on error and that this
change causes the kernel to no longer notice that error?
> break;
> case AUDIT_GID:
> case AUDIT_EGID:
> @@ -372,10 +369,7 @@ static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
> /* bit ops not implemented for gid comparisons */
> if (f->op == Audit_bitmask || f->op == Audit_bittest)
> goto exit_free;
> -
> f->gid = make_kgid(current_user_ns(), f->val);
> - if (!gid_valid(f->gid))
> - goto exit_free;
> break;
> case AUDIT_PID:
> case AUDIT_PERS:
> @@ -469,10 +463,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
> /* bit ops not implemented for uid comparisons */
> if (f->op == Audit_bitmask || f->op == Audit_bittest)
> goto exit_free;
> -
> f->uid = make_kuid(current_user_ns(), f->val);
> - if (!uid_valid(f->uid))
> - goto exit_free;
> break;
> case AUDIT_GID:
> case AUDIT_EGID:
> @@ -482,10 +473,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
> /* bit ops not implemented for gid comparisons */
> if (f->op == Audit_bitmask || f->op == Audit_bittest)
> goto exit_free;
> -
> f->gid = make_kgid(current_user_ns(), f->val);
> - if (!gid_valid(f->gid))
> - goto exit_free;
> break;
> case AUDIT_PID:
> case AUDIT_PERS:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists