aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-01-03 14:23:08 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-17 16:17:02 -0500
commitc9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896 (patch)
tree510a09bc02c5dccb7ef83c88f2a00546b17e2c17
parentb34b039324bf081554ee8678f9b8c5d937e5206c (diff)
audit: allow interfield comparison between gid and ogid
Allow audit rules to compare the gid of the running task to the gid of the inode in question. Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--include/linux/audit.h3
-rw-r--r--kernel/auditsc.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 838e05fc0582..fffbc2176ee1 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -184,8 +184,9 @@
184 184
185/* AUDIT_FIELD_COMPARE rule list */ 185/* AUDIT_FIELD_COMPARE rule list */
186#define AUDIT_COMPARE_UID_TO_OBJ_UID 1 186#define AUDIT_COMPARE_UID_TO_OBJ_UID 1
187#define AUDIT_COMPARE_GID_TO_OBJ_GID 2
187 188
188#define AUDIT_MAX_FIELD_COMPARE AUDIT_COMPARE_UID_TO_OBJ_UID 189#define AUDIT_MAX_FIELD_COMPARE AUDIT_COMPARE_GID_TO_OBJ_GID
189/* Rule fields */ 190/* Rule fields */
190 /* These are useful when checking the 191 /* These are useful when checking the
191 * task structure at task creation time 192 * task structure at task creation time
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index b12cc32fe377..861c7b9c565a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -474,6 +474,8 @@ static int audit_compare_id(uid_t uid1,
474 uid_t uid2; 474 uid_t uid2;
475 int rc; 475 int rc;
476 476
477 BUILD_BUG_ON(sizeof(uid_t) != sizeof(gid_t));
478
477 if (name) { 479 if (name) {
478 addr = (unsigned long)name; 480 addr = (unsigned long)name;
479 addr += name_offset; 481 addr += name_offset;
@@ -510,6 +512,10 @@ static int audit_field_compare(struct task_struct *tsk,
510 return audit_compare_id(cred->uid, 512 return audit_compare_id(cred->uid,
511 name, offsetof(struct audit_names, uid), 513 name, offsetof(struct audit_names, uid),
512 f, ctx); 514 f, ctx);
515 case AUDIT_COMPARE_GID_TO_OBJ_GID:
516 return audit_compare_id(cred->gid,
517 name, offsetof(struct audit_names, gid),
518 f, ctx);
513 default: 519 default:
514 WARN(1, "Missing AUDIT_COMPARE define. Report as a bug\n"); 520 WARN(1, "Missing AUDIT_COMPARE define. Report as a bug\n");
515 return 0; 521 return 0;