diff options
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 48a39579c45c..031f979019d1 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -95,6 +95,7 @@ struct audit_names { | |||
95 | uid_t uid; | 95 | uid_t uid; |
96 | gid_t gid; | 96 | gid_t gid; |
97 | dev_t rdev; | 97 | dev_t rdev; |
98 | unsigned flags; | ||
98 | }; | 99 | }; |
99 | 100 | ||
100 | struct audit_aux_data { | 101 | struct audit_aux_data { |
@@ -792,6 +793,8 @@ static void audit_log_exit(struct audit_context *context) | |||
792 | audit_log_format(ab, " name="); | 793 | audit_log_format(ab, " name="); |
793 | audit_log_untrustedstring(ab, context->names[i].name); | 794 | audit_log_untrustedstring(ab, context->names[i].name); |
794 | } | 795 | } |
796 | audit_log_format(ab, " flags=%x\n", context->names[i].flags); | ||
797 | |||
795 | if (context->names[i].ino != (unsigned long)-1) | 798 | if (context->names[i].ino != (unsigned long)-1) |
796 | audit_log_format(ab, " inode=%lu dev=%02x:%02x mode=%#o" | 799 | audit_log_format(ab, " inode=%lu dev=%02x:%02x mode=%#o" |
797 | " ouid=%u ogid=%u rdev=%02x:%02x", | 800 | " ouid=%u ogid=%u rdev=%02x:%02x", |
@@ -1018,7 +1021,7 @@ void audit_putname(const char *name) | |||
1018 | 1021 | ||
1019 | /* Store the inode and device from a lookup. Called from | 1022 | /* Store the inode and device from a lookup. Called from |
1020 | * fs/namei.c:path_lookup(). */ | 1023 | * fs/namei.c:path_lookup(). */ |
1021 | void audit_inode(const char *name, const struct inode *inode) | 1024 | void audit_inode(const char *name, const struct inode *inode, unsigned flags) |
1022 | { | 1025 | { |
1023 | int idx; | 1026 | int idx; |
1024 | struct audit_context *context = current->audit_context; | 1027 | struct audit_context *context = current->audit_context; |
@@ -1044,12 +1047,13 @@ void audit_inode(const char *name, const struct inode *inode) | |||
1044 | ++context->ino_count; | 1047 | ++context->ino_count; |
1045 | #endif | 1048 | #endif |
1046 | } | 1049 | } |
1047 | context->names[idx].ino = inode->i_ino; | 1050 | context->names[idx].flags = flags; |
1048 | context->names[idx].dev = inode->i_sb->s_dev; | 1051 | context->names[idx].ino = inode->i_ino; |
1049 | context->names[idx].mode = inode->i_mode; | 1052 | context->names[idx].dev = inode->i_sb->s_dev; |
1050 | context->names[idx].uid = inode->i_uid; | 1053 | context->names[idx].mode = inode->i_mode; |
1051 | context->names[idx].gid = inode->i_gid; | 1054 | context->names[idx].uid = inode->i_uid; |
1052 | context->names[idx].rdev = inode->i_rdev; | 1055 | context->names[idx].gid = inode->i_gid; |
1056 | context->names[idx].rdev = inode->i_rdev; | ||
1053 | } | 1057 | } |
1054 | 1058 | ||
1055 | void auditsc_get_stamp(struct audit_context *ctx, | 1059 | void auditsc_get_stamp(struct audit_context *ctx, |