Commit 0223fad3 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Paul Moore
Browse files

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: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent bf361231

kernel/auditsc.c

+15 −3
Original line number Diff line number Diff line
@@ -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);