Commit fec5f85e authored by Roberto Sassu's avatar Roberto Sassu Committed by Paul Moore
Browse files

ima: Align ima_post_read_file() definition with LSM infrastructure 



Change ima_post_read_file() definition, by making "void *buf" a
"char *buf", so that it can be registered as implementation of the
post_read_file hook.

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Reviewed-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Acked-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 526864dd

include/linux/ima.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ extern int ima_post_load_data(char *buf, loff_t size, 
			      enum kernel_load_data_id id, char *description);

extern int ima_read_file(struct file *file, enum kernel_read_file_id id,

			 bool contents);

extern int ima_post_read_file(struct file *file, void *buf, loff_t size,

extern int ima_post_read_file(struct file *file, char *buf, loff_t size,

			      enum kernel_read_file_id id);

extern void ima_post_path_mknod(struct mnt_idmap *idmap,

				struct dentry *dentry);
@@ -108,7 +108,7 @@ static inline int ima_read_file(struct file *file, enum kernel_read_file_id id, 
	return 0;

}



static inline int ima_post_read_file(struct file *file, void *buf, loff_t size,

static inline int ima_post_read_file(struct file *file, char *buf, loff_t size,

				     enum kernel_read_file_id id)

{

	return 0;

security/integrity/ima/ima_main.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ const int read_idmap[READING_MAX_ID] = { 
 * On success return 0.  On integrity appraisal error, assuming the file

 * is in policy and IMA-appraisal is in enforcing mode, return -EACCES.

 */

int ima_post_read_file(struct file *file, void *buf, loff_t size,

int ima_post_read_file(struct file *file, char *buf, loff_t size,

		       enum kernel_read_file_id read_id)

{

	enum ima_hooks func;