Commit 862609cf authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by mohancm100
Browse files

Revert "security: lsm_audit: add ioctl specific auditing" 



This reverts commit b9417e527039f72073a0d368955bd1267f92ba70.

Bug: 22846070
Change-Id: I11d8880135a32b54e8eb8b95091b0226aa16735e
Signed-off-by: default avatarJeff Vander Stoep <jeffv@google.com>
parent 76925cfe

include/linux/lsm_audit.h

+0 −7
Original line number Diff line number Diff line
@@ -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 {

security/lsm_audit.c

+0 −15
Original line number Diff line number Diff line
@@ -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;