Skip to content

Commit

Permalink
ima: Fix NULL pointer dereference in ima_file_hash
Browse files Browse the repository at this point in the history
ima_file_hash can be called when there is no iint->ima_hash available
even though the inode exists in the integrity cache. It is fairly
common for a file to not have a hash. (e.g. an mknodat, prior to the
file being closed).

Another example where this can happen (suggested by Jann Horn):

Process A does:

	while(1) {
		unlink("/tmp/imafoo");
		fd = open("/tmp/imafoo", O_RDWR|O_CREAT|O_TRUNC, 0700);
		if (fd == -1) {
			perror("open");
			continue;
		}
		write(fd, "A", 1);
		close(fd);
	}

and Process B does:

	while (1) {
		int fd = open("/tmp/imafoo", O_RDONLY);
		if (fd == -1)
			continue;
    		char *mapping = mmap(NULL, 0x1000, PROT_READ|PROT_EXEC,
			 	     MAP_PRIVATE, fd, 0);
		if (mapping != MAP_FAILED)
			munmap(mapping, 0x1000);
		close(fd);
  	}

Due to the race to get the iint->mutex between ima_file_hash and
process_measurement iint->ima_hash could still be NULL.

Fixes: 6beea7a ("ima: add the ability to query the cached hash of a given file")
Signed-off-by: KP Singh <[email protected]>
Reviewed-by: Florent Revest <[email protected]>
Signed-off-by: Mimi Zohar <[email protected]>
  • Loading branch information
sinkap authored and mimizohar committed Sep 16, 2020
1 parent 455b6c9 commit aa662fc
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions security/integrity/ima/ima_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,16 @@ int ima_file_hash(struct file *file, char *buf, size_t buf_size)
return -EOPNOTSUPP;

mutex_lock(&iint->mutex);

/*
* ima_file_hash can be called when ima_collect_measurement has still
* not been called, we might not always have a hash.
*/
if (!iint->ima_hash) {
mutex_unlock(&iint->mutex);
return -EOPNOTSUPP;
}

if (buf) {
size_t copied_size;

Expand Down

0 comments on commit aa662fc

Please sign in to comment.