Skip to content

Commit

Permalink
Revert "security: lsm_audit: add ioctl specific auditing"
Browse files Browse the repository at this point in the history
This reverts commit b9417e5.

Bug: 22846070
Change-Id: I11d8880135a32b54e8eb8b95091b0226aa16735e
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
  • Loading branch information
jeffvanderstoep authored and Mark Salyzyn committed Oct 29, 2015
1 parent 5e8b2cb commit a6654a4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
7 changes: 0 additions & 7 deletions include/linux/lsm_audit.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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 {
Expand Down
15 changes: 0 additions & 15 deletions security/lsm_audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a6654a4

Please sign in to comment.