mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 02:16:45 +07:00
audit: enforce op for string fields
The field operator is ignored on several string fields. WATCH, DIR, PERM and FILETYPE field operators are completely ignored and meaningless since the op is not referenced in audit_filter_rules(). Range and bitwise operators are already addressed in ghak73. Honour the operator for WATCH, DIR, PERM, FILETYPE fields as is done in the EXE field. Please see github issue https://github.com/linux-audit/audit-kernel/issues/114 Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
parent
bf361231c2
commit
0223fad3c9
@ -601,12 +601,20 @@ static int audit_filter_rules(struct task_struct *tsk,
|
||||
}
|
||||
break;
|
||||
case AUDIT_WATCH:
|
||||
if (name)
|
||||
result = audit_watch_compare(rule->watch, name->ino, name->dev);
|
||||
if (name) {
|
||||
result = audit_watch_compare(rule->watch,
|
||||
name->ino,
|
||||
name->dev);
|
||||
if (f->op == Audit_not_equal)
|
||||
result = !result;
|
||||
}
|
||||
break;
|
||||
case AUDIT_DIR:
|
||||
if (ctx)
|
||||
if (ctx) {
|
||||
result = match_tree_refs(ctx, rule->tree);
|
||||
if (f->op == Audit_not_equal)
|
||||
result = !result;
|
||||
}
|
||||
break;
|
||||
case AUDIT_LOGINUID:
|
||||
result = audit_uid_comparator(audit_get_loginuid(tsk),
|
||||
@ -689,9 +697,13 @@ static int audit_filter_rules(struct task_struct *tsk,
|
||||
break;
|
||||
case AUDIT_PERM:
|
||||
result = audit_match_perm(ctx, f->val);
|
||||
if (f->op == Audit_not_equal)
|
||||
result = !result;
|
||||
break;
|
||||
case AUDIT_FILETYPE:
|
||||
result = audit_match_filetype(ctx, f->val);
|
||||
if (f->op == Audit_not_equal)
|
||||
result = !result;
|
||||
break;
|
||||
case AUDIT_FIELD_COMPARE:
|
||||
result = audit_field_compare(tsk, cred, f, ctx, name);
|
||||
|
Loading…
Reference in New Issue
Block a user