mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
ima: always return negative code for error
[ Upstream commit f5e1040196
]
integrity_kernel_read() returns the number of bytes read. If this is
a short read then this positive value is returned from
ima_calc_file_hash_atfm(). Currently this is only indirectly called from
ima_calc_file_hash() and this function only tests for the return value
being zero or nonzero and also doesn't forward the return value.
Nevertheless there's no point in returning a positive value as an error,
so translate a short read into -EINVAL.
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>
This commit is contained in:
parent
eec7ef3096
commit
1e42dec195
1 changed files with 4 additions and 1 deletions
|
@ -298,8 +298,11 @@ static int ima_calc_file_hash_atfm(struct file *file,
|
|||
rbuf_len = min_t(loff_t, i_size - offset, rbuf_size[active]);
|
||||
rc = integrity_kernel_read(file, offset, rbuf[active],
|
||||
rbuf_len);
|
||||
if (rc != rbuf_len)
|
||||
if (rc != rbuf_len) {
|
||||
if (rc >= 0)
|
||||
rc = -EINVAL;
|
||||
goto out3;
|
||||
}
|
||||
|
||||
if (rbuf[1] && offset) {
|
||||
/* Using two buffers, and it is not the first
|
||||
|
|
Loading…
Reference in a new issue