From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27E80C3F2D1 for ; Tue, 3 Mar 2020 17:48:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 039BF20CC7 for ; Tue, 3 Mar 2020 17:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257738; bh=06zphrd16BCYMlWwmetBuNSFfj4P02ROA5ONAvY8z00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=huDqemE4vSHNJ62qge2x5k/gT5Mt/05i9BEEV9qJD7Jwk43yc33fMT+I3HwLmYGa7 V7N2NHX2O/+2VxuhpsIDxCXgXzAOlnPJ/oj7zr5OMlOEvTETMZ/U9GtZxRzHgBFJRF yKwlxkIYyW5x1GP9GZqknKoL/Ua4Zc/YyFt8MXfM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730739AbgCCRs4 (ORCPT ); Tue, 3 Mar 2020 12:48:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:56138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731696AbgCCRs4 (ORCPT ); Tue, 3 Mar 2020 12:48:56 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84D2F20870; Tue, 3 Mar 2020 17:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257735; bh=06zphrd16BCYMlWwmetBuNSFfj4P02ROA5ONAvY8z00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqrFOUzvOgh/3WHHni6OsQpnuu5+5to1yRqxJQL4XSXxhPX9Kx1N9+kCIbVPDi5px UI13658hCrKzH5PAH60KqSNCDsA9vhCeKZbHci8lAOnnSlWxFiTroeodLMKWEcDHUp SvtJYIHhVfLTEtHTMc/7tOUQJA3yhRzoF4zq0LYo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jens Axboe Subject: [PATCH 5.5 101/176] io_uring: fix 32-bit compatability with sendmsg/recvmsg Date: Tue, 3 Mar 2020 18:42:45 +0100 Message-Id: <20200303174316.529389059@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Axboe commit d876836204897b6d7d911f942084f69a1e9d5c4d upstream. We must set MSG_CMSG_COMPAT if we're in compatability mode, otherwise the iovec import for these commands will not do the right thing and fail the command with -EINVAL. Found by running the test suite compiled as 32-bit. Cc: stable@vger.kernel.org Fixes: aa1fa28fc73e ("io_uring: add support for recvmsg()") Fixes: 0fa03c624d8f ("io_uring: add support for sendmsg()") Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/io_uring.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2166,6 +2166,11 @@ static int io_sendmsg_prep(struct io_kio sr->msg_flags = READ_ONCE(sqe->msg_flags); sr->msg = u64_to_user_ptr(READ_ONCE(sqe->addr)); +#ifdef CONFIG_COMPAT + if (req->ctx->compat) + sr->msg_flags |= MSG_CMSG_COMPAT; +#endif + if (!io) return 0; @@ -2258,6 +2263,11 @@ static int io_recvmsg_prep(struct io_kio sr->msg_flags = READ_ONCE(sqe->msg_flags); sr->msg = u64_to_user_ptr(READ_ONCE(sqe->addr)); +#ifdef CONFIG_COMPAT + if (req->ctx->compat) + sr->msg_flags |= MSG_CMSG_COMPAT; +#endif + if (!io) return 0;