Commit 6df7a811 authored by Alexander Steffen's avatar Alexander Steffen Committed by sanglipeng
Browse files

tpm_tis: Explicitly check for error code

stable inclusion
from stable-v5.10.190
commit b1867cddd780965e049e6ef9bf3cdad7ae6ea184
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I928UI

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b1867cddd780965e049e6ef9bf3cdad7ae6ea184



--------------------------------

commit 513253f8 upstream.

recv_data either returns the number of received bytes, or a negative value
representing an error code. Adding the return value directly to the total
number of received bytes therefore looks a little weird, since it might add
a negative error code to a sum of bytes.

The following check for size < expected usually makes the function return
ETIME in that case, so it does not cause too many problems in practice. But
to make the code look cleaner and because the caller might still be
interested in the original error code, explicitly check for the presence of
an error code and pass that through.

Cc: stable@vger.kernel.org
Fixes: cb535425 ("[PATCH] tpm: spacing cleanups 2")
Signed-off-by: default avatarAlexander Steffen <Alexander.Steffen@infineon.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent d2e32d55
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment