Commit 48fc8eeb authored Nov 30, 2021 by Todd Kjos Committed by Greg Kroah-Hartman Jan 27, 2022

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: bb4a2e48 ("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>

parent f3c2c7f3

drivers/android/binder.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}