Unverified Commit 593dd680 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10177 ima: Fix use-after-free on a dentry's dname.name 

Merge Pull Request from: @ci-robot 
 
PR sync from: "GONG, Ruiqi" <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BA4D2YA6CZQPW7YAZW42YAKDM36HF5ID/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAD0O1 
 
Link:https://gitee.com/openeuler/kernel/pulls/10177

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents be0a5121 a7e9538a

security/integrity/ima/ima_api.c

+12 −4
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ int ima_collect_measurement(struct integrity_iint_cache *iint, 
	const char *audit_cause = "failed";

	struct inode *inode = file_inode(file);

	struct inode *real_inode = d_real_inode(file_dentry(file));

	const char *filename = file->f_path.dentry->d_name.name;

	struct ima_max_digest_data hash;

	struct name_snapshot filename;

	struct kstat stat;

	int result = 0;

	int length;
@@ -350,9 +350,13 @@ int ima_collect_measurement(struct integrity_iint_cache *iint, 
		if (file->f_flags & O_DIRECT)

			audit_cause = "failed(directio)";



		take_dentry_name_snapshot(&filename, file->f_path.dentry);



		integrity_audit_msg(AUDIT_INTEGRITY_DATA, inode,

				    filename, "collect_data", audit_cause,

				    result, 0);

				    filename.name.name, "collect_data",

				    audit_cause, result, 0);



		release_dentry_name_snapshot(&filename);

	}

	return result;

}
@@ -486,6 +490,7 @@ void ima_audit_measurement(struct integrity_iint_cache *iint, 
 */

const char *ima_d_path(const struct path *path, char **pathbuf, char *namebuf)

{

	struct name_snapshot filename;

	char *pathname = NULL;



	*pathbuf = __getname();
@@ -499,7 +504,10 @@ const char *ima_d_path(const struct path *path, char **pathbuf, char *namebuf) 
	}



	if (!pathname) {

		strscpy(namebuf, path->dentry->d_name.name, NAME_MAX);

		take_dentry_name_snapshot(&filename, path->dentry);

		strscpy(namebuf, filename.name.name, NAME_MAX);

		release_dentry_name_snapshot(&filename);



		pathname = namebuf;

	}

security/integrity/ima/ima_template_lib.c

+14 −3
Original line number Diff line number Diff line
@@ -483,7 +483,10 @@ static int ima_eventname_init_common(struct ima_event_data *event_data, 
				     bool size_limit)

{

	const char *cur_filename = NULL;

	struct name_snapshot filename;

	u32 cur_filename_len = 0;

	bool snapshot = false;

	int ret;



	BUG_ON(event_data->filename == NULL && event_data->file == NULL);
@@ -496,7 +499,10 @@ static int ima_eventname_init_common(struct ima_event_data *event_data, 
	}



	if (event_data->file) {

		cur_filename = event_data->file->f_path.dentry->d_name.name;

		take_dentry_name_snapshot(&filename,

					  event_data->file->f_path.dentry);

		snapshot = true;

		cur_filename = filename.name.name;

		cur_filename_len = strlen(cur_filename);

	} else

		/*
@@ -505,8 +511,13 @@ static int ima_eventname_init_common(struct ima_event_data *event_data, 
		 */

		cur_filename_len = IMA_EVENT_NAME_LEN_MAX;

out:

	return ima_write_template_field_data(cur_filename, cur_filename_len,

	ret = ima_write_template_field_data(cur_filename, cur_filename_len,

					    DATA_FMT_STRING, field_data);



	if (snapshot)

		release_dentry_name_snapshot(&filename);



	return ret;

}



/*