Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "security: lsm_audit: add ioctl specific auditing" 

This reverts commit 643ce43c226cdfa73bcac2fa91f1f8a3dfd171a2.

Bug: 22846070
Change-Id: I5dde1878e5baac43b4968141c0dc60b70e042183
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
This commit is contained in:
Jeff Vander Stoep 2015-07-29 18:37:24 -07:00 committed by Zhao Wei Liew
parent 9d2313fc12
commit f06092ffdc
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/lsm_audit.h
View File

@ -40,11 +40,6 @@ struct lsm_network_audit {
} fam; } fam;
}; };
struct lsm_ioctlop_audit {
struct path path;
u16 cmd;
};
/* Auxiliary data to use in generating the audit record. */ /* Auxiliary data to use in generating the audit record. */
struct common_audit_data { struct common_audit_data {
char type; char type;
@ -58,7 +53,6 @@ struct common_audit_data {
#define LSM_AUDIT_DATA_KMOD 8 #define LSM_AUDIT_DATA_KMOD 8
#define LSM_AUDIT_DATA_INODE 9 #define LSM_AUDIT_DATA_INODE 9
#define LSM_AUDIT_DATA_DENTRY 10 #define LSM_AUDIT_DATA_DENTRY 10
#define LSM_AUDIT_DATA_IOCTL_OP 11
struct task_struct *tsk; struct task_struct *tsk;
union { union {
struct path path; struct path path;
@ -75,7 +69,6 @@ struct common_audit_data {
} key_struct; } key_struct;
#endif #endif
char *kmod_name; char *kmod_name;
struct lsm_ioctlop_audit *op;
} u; } u;
/* this union contains LSM specific data */ /* this union contains LSM specific data */
union { union {

15
security/lsm_audit.c
View File

@ -242,21 +242,6 @@ static void dump_common_audit_data(struct audit_buffer *ab,
} }
break; 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: { case LSM_AUDIT_DATA_DENTRY: {
struct inode *inode; struct inode *inode;