From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO42P-0005n7-Ra for qemu-devel@nongnu.org; Fri, 15 Jul 2016 10:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bO42O-0005Sx-Tf for qemu-devel@nongnu.org; Fri, 15 Jul 2016 10:24:21 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO42O-0005Sm-Mu for qemu-devel@nongnu.org; Fri, 15 Jul 2016 10:24:20 -0400 From: Peter Maydell Date: Fri, 15 Jul 2016 14:57:27 +0100 Message-Id: <1468591048-30230-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1468591048-30230-1-git-send-email-peter.maydell@linaro.org> References: <1468591048-30230-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 2/3] linux-user: Fix errno for sendrecvmsg with large iovec length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio The sendmsg and recvmsg syscalls use a different errno to indicate an overlarge iovec length from readv and writev. Handle this special case in do_sendrcvmsg_locked() to avoid getting the default errno returned by lock_iovec(). Signed-off-by: Peter Maydell --- linux-user/syscall.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8d36d6c..a21ee59 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2985,6 +2985,15 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp, count = tswapal(msgp->msg_iovlen); target_vec = tswapal(msgp->msg_iov); + + if (count > IOV_MAX) { + /* sendrcvmsg returns a different errno for this condition than + * readv/writev, so we must catch it here before lock_iovec() does. + */ + ret = -TARGET_EMSGSIZE; + goto out2; + } + vec = lock_iovec(send ? VERIFY_READ : VERIFY_WRITE, target_vec, count, send); if (vec == NULL) { -- 1.9.1