diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2015-07-29 20:27:47 -0700 |
|---|---|---|
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-12-08 11:27:01 -0800 |
| commit | 2bd0a2a8c54cbe37b9a8490584e8438b9abb7b2e (patch) | |
| tree | 517fbc71227c818d23eb860e2a6d6dbaaae68edb | |
| parent | c5ea6288d03cd8f73991fcd4abced5df6864e567 (diff) | |
| download | edison-v3.10-2bd0a2a8c54cbe37b9a8490584e8438b9abb7b2e.tar.gz | |
Revert "security: lsm_audit: add ioctl specific auditing"
This reverts commit c8c3cd48e44fe12a41cd20e46d36fcfe5a759fd7.
Bug: 22846070
Change-Id: Ibf79b4c76f22f0af2d39e377b551151837a782cd
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
| -rw-r--r-- | include/linux/lsm_audit.h | 7 | ||||
| -rw-r--r-- | security/lsm_audit.c | 15 |
2 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h index ffb9c9da4f3..1cc89e9df48 100644 --- a/include/linux/lsm_audit.h +++ b/include/linux/lsm_audit.h @@ -40,11 +40,6 @@ struct lsm_network_audit { } fam; }; -struct lsm_ioctlop_audit { - struct path path; - u16 cmd; -}; - /* Auxiliary data to use in generating the audit record. */ struct common_audit_data { char type; @@ -58,7 +53,6 @@ struct common_audit_data { #define LSM_AUDIT_DATA_KMOD 8 #define LSM_AUDIT_DATA_INODE 9 #define LSM_AUDIT_DATA_DENTRY 10 -#define LSM_AUDIT_DATA_IOCTL_OP 11 union { struct path path; struct dentry *dentry; @@ -74,7 +68,6 @@ struct common_audit_data { } key_struct; #endif char *kmod_name; - struct lsm_ioctlop_audit *op; } u; /* this union contains LSM specific data */ union { diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 8f6b8e8a4cc..8d8d97dbb38 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -245,21 +245,6 @@ static void dump_common_audit_data(struct audit_buffer *ab, } break; } - case LSM_AUDIT_DATA_IOCTL_OP: { - struct inode *inode; - - audit_log_d_path(ab, " path=", &a->u.op->path); - - inode = a->u.op->path.dentry->d_inode; - if (inode) { - audit_log_format(ab, " dev="); - audit_log_untrustedstring(ab, inode->i_sb->s_id); - audit_log_format(ab, " ino=%lu", inode->i_ino); - } - - audit_log_format(ab, " ioctlcmd=%hx", a->u.op->cmd); - break; - } case LSM_AUDIT_DATA_DENTRY: { struct inode *inode; |