Commit 96c9e1de authored by Patrick Callaghan's avatar Patrick Callaghan Committed by Mimi Zohar
Browse files

ima: avoid appraise error for hash calc interrupt



The integrity_kernel_read() call in ima_calc_file_hash_tfm() can return
a value of 0 before all bytes of the file are read. A value of 0 would
normally indicate an EOF. This has been observed if a user process is
causing a file appraisal and is terminated with a SIGTERM signal. The
most common occurrence of seeing the problem is if a shutdown or systemd
reload is initiated while files are being appraised.

The problem is similar to commit <f5e10401> (ima: always return
negative code for error) that fixed the problem in
ima_calc_file_hash_atfm().

Suggested-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarPatrick Callaghan <patrickc@linux.ibm.com>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent e42617b8
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -362,8 +362,10 @@ static int ima_calc_file_hash_tfm(struct file *file,
			rc = rbuf_len;
			break;
		}
		if (rbuf_len == 0)
		if (rbuf_len == 0) {	/* unexpected EOF */
			rc = -EINVAL;
			break;
		}
		offset += rbuf_len;

		rc = crypto_shash_update(shash, rbuf, rbuf_len);