diff options
| author | Todd Kjos <tkjos@google.com> | 2021-11-30 10:51:49 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 09:19:38 +0100 |
| commit | 48fc8eebd17456460024836605c4ded6c338b732 (patch) | |
| tree | 43b401b4dd09013c571101ee46a5b9221c4fb221 | |
| parent | f3c2c7f3f8840abeac7ec675def4126d2dab9104 (diff) | |
| download | linux-stable-48fc8eebd17456460024836605c4ded6c338b732.tar.gz linux-stable-48fc8eebd17456460024836605c4ded6c338b732.tar.bz2 linux-stable-48fc8eebd17456460024836605c4ded6c338b732.zip | |
binder: fix handling of error during copy
[ Upstream commit fe6b1869243f23a485a106c214bcfdc7aa0ed593 ]
If a memory copy function fails to copy the whole buffer,
a positive integar with the remaining bytes is returned.
In binder_translate_fd_array() this can result in an fd being
skipped due to the failed copy, but the loop continues
processing fds since the early return condition expects a
negative integer on error.
Fix by returning "ret > 0 ? -EINVAL : ret" to handle this case.
Fixes: bb4a2e48d510 ("binder: return errors from buffer copy functions")
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
Link: https://lore.kernel.org/r/20211130185152.437403-2-tkjos@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/android/binder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 0512af0f0464..b9fb2a926944 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2660,8 +2660,8 @@ static int binder_translate_fd_array(struct binder_fd_array_object *fda, if (!ret) ret = binder_translate_fd(fd, offset, t, thread, in_reply_to); - if (ret < 0) - return ret; + if (ret) + return ret > 0 ? -EINVAL : ret; } return 0; } |