Commit c7f7e58f authored by Thiago Jung Bauermann's avatar Thiago Jung Bauermann Committed by James Morris
Browse files

integrity: Remove references to module keyring 



From what I can tell, it has never been used.

Mimi: This was introduced prior to Rusty's decision to use appended
signatures for kernel modules.

Signed-off-by: default avatarThiago Jung Bauermann <bauerman@linux.ibm.com>
Acked-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarJames Morris <james.morris@microsoft.com>
parent 5580b4a1

security/integrity/digsig.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = { 
	".evm",

	".ima",

#endif

	"_module",

	".platform",

};

security/integrity/integrity.h

+2 −3
Original line number Diff line number Diff line
@@ -141,9 +141,8 @@ int integrity_kernel_read(struct file *file, loff_t offset, 


#define INTEGRITY_KEYRING_EVM		0

#define INTEGRITY_KEYRING_IMA		1

#define INTEGRITY_KEYRING_MODULE	2

#define INTEGRITY_KEYRING_PLATFORM	3

#define INTEGRITY_KEYRING_MAX		4

#define INTEGRITY_KEYRING_PLATFORM	2

#define INTEGRITY_KEYRING_MAX		3



extern struct dentry *integrity_dir;

CRA Git | Maintained and supported by SUSTech CRA and CCSE