diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-02 10:00:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-11 18:21:11 +0200 |
| commit | 4753e7a824cbfd91c0a795f0c794e5af3cf80f98 (patch) | |
| tree | 93fb04d385a60c2ce2c0c4556d2df4b865e0ddb2 /security | |
| parent | b69c3085fcc6839b2c86cab3b7ac9a38495a73ae (diff) | |
| download | linux-stable-4753e7a824cbfd91c0a795f0c794e5af3cf80f98.tar.gz linux-stable-4753e7a824cbfd91c0a795f0c794e5af3cf80f98.tar.bz2 linux-stable-4753e7a824cbfd91c0a795f0c794e5af3cf80f98.zip | |
ima: fix freeing ongoing ahash_request
[ Upstream commit 4ece3125f21b1d42b84896c5646dbf0e878464e1 ]
integrity_kernel_read() can fail in which case we forward to call
ahash_request_free() on a currently running request. We have to wait
for its completion before we can free the request.
This was observed by interrupting a "find / -type f -xdev -print0 | xargs -0
cat 1>/dev/null" with ctrl-c on an IMA enabled filesystem.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_crypto.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index b7822d2b7973..f63b4bd45d60 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -274,6 +274,11 @@ static int ima_calc_file_hash_atfm(struct file *file, if (rc != rbuf_len) { if (rc >= 0) rc = -EINVAL; + /* + * Forward current rc, do not overwrite with return value + * from ahash_wait() + */ + ahash_wait(ahash_rc, &wait); goto out3; } |