From patchwork Mon Mar 25 14:34:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 161127 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4047889jan; Mon, 25 Mar 2019 07:37:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIV2xCq0cSeju0E/ieB8xRHETfywaWBzbS/MQKTftLyMPfJ6Ll5YiRYkgdu9Zm6CnR2KL7 X-Received: by 2002:a63:c84c:: with SMTP id l12mr23630211pgi.287.1553524639101; Mon, 25 Mar 2019 07:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553524639; cv=none; d=google.com; s=arc-20160816; b=vgeto8q0kZl1Ckhq+TViTuDkr4+lUskAGKLIce5dY7pPb4r0X84UTyxsrQSbEuj+nH JfghSR5MCB2klyZBB+IjQa4qTRxTfUuLj9bt17mvKrNz69bTUDJCtVTjVpoQeoRL++Bt J8KplfjZcyxZFUA2d9Hr3UQ70OIItuphdDYrCruOsgcCdwj/5dncJUWnGAh8Do271zq/ 9tz7OVTyx79OYfGZqSD1G62n0GQJEClwoYyXxv3pnDpshpblCvmhJqHTA6XnCz2Jk9ui R/URhZ5mO03+RMhb5KM1HsJzMk3g4pgATl0R7d0xJk1a09n4gu26qqe7MdVPzvC5XSf5 o/AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=OQNDefcUHPBcC/a3Yy60wiRuOLrLcvdHqDIy14438Q0=; b=rfGGnKY1hdJqMvY/lUPUKi5G23vmLdEc8Ja0UrXO+DjhbH33Cg4W/h6YWO3CSoTZmB jug+Vp4ED8UFYgcL3cgrguZtYOO11izBVVtXHCATSgGdTN0NYel+jD8x6SrOaDLAzamT eopCK89gFGGmrW2626PcrKcoHuYRIDOaM+gmd4lAqfpepDyFNn0YUi429ae6F9wvUjlT XCs1aMyn+QJ2gfOePXbyoOyCMRno8Thwd7lhxQG9RCaIVRGSn+Zp9HQF/j/r/vvjctSs 5GzUPZTU8/o90VGvUD8n45yb/GAxHnPXfOnUme2rQ+tdUjOPpgBSBjr0KmLev6MvV5M5 zaXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c23si14069027pgj.27.2019.03.25.07.37.18; Mon, 25 Mar 2019 07:37:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728882AbfCYOhQ (ORCPT + 31 others); Mon, 25 Mar 2019 10:37:16 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:39475 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725355AbfCYOhQ (ORCPT ); Mon, 25 Mar 2019 10:37:16 -0400 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MmQUL-1gi8Mn4AZV-00iUks; Mon, 25 Mar 2019 15:36:21 +0100 From: Arnd Bergmann To: Andrew Morton , Jens Axboe Cc: Arnd Bergmann , Alexander Viro , Hannes Reinecke , Matthew Wilcox , David Hildenbrand , Nikolay Borisov , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] io_uring: fix big-endian compat signal mask handling Date: Mon, 25 Mar 2019 15:34:53 +0100 Message-Id: <20190325143521.34928-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:OWwNbX2m3xkVaKxTRKGlmRyvOLYLbsTmGhlI5VKBU+6k1xUVw6U qFSHxwasMwhNuYUViKOLDxszTGqikFO3ZIzFi9lv2kulti9t56mUdo9z5V7ArIWoT06WLbd 59/vjaFyWCQg/aiZL2n9kBizFLXIqKl8rLa8eZstmZnsNcSst5s/0zIlY1+T0miwPEz7nlq TDRCPn0Og9DcCeVR2qfXw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:o2oDqk2OFGo=:lS2Zp12zO4LYbc7SiuDsIG 7rg2CqXOxZquKw7QMF/WLSZIS8QYUnaqvoLbaD9fI2lH8fAziCYGGglf085H3pa9aOU0i3kia 53McurYMouGfR5YLTkevf3Ilsg+j1G2aRRyGIXP3e+mp/4aqn9p9/0njjgx//oQuveeJajv42 LGM624PellCn71aXHJd9QYT1Ix7tFrRx9B3tn+H8u0sHMUBP7yS7AxEirE+fGarAIGsPsGS9l 724OSm6HO4/m6RqXH6benxZTQnSOcR/73ANyiOq9U/7ed6dhYlt7f3QojhaBKwnwaWtkakRYZ ssG2Nk5dDE9x0nifEcMewDbVkRdWnYcMQIOYdlA/8yz7hc0eu2VQCfDwb9j1udpZ+w/SG6UTr vMk7VC0DxIhL+eQBSdgcj5FOVMftq0s+XrX0X+MjPA0McMYwbr5os9YBBv5qFh9kXSGNBeE3A RdYg4y5j8o/xxfDuv0t6gixcxeh2lTWQRYZxyfAN4VS16TnkmKtLHQX5fZRBcaC7H8YuAkyFh BWOqzE3b7IG1pzqDuyX2yZH8XzJv61UsVk/o8rsR9B+z5oM0+phHu/pchW5FrWbbvhNfa5PxI qq0WVZE3t7gxd32c/gxg/CAWeHnSE6ZJulx8hLLsGCSTvI9NqFJbxQ3x5jwdG/E5cwIjwBmj4 dbmT37U1gp+FhhQu18eyUeKlOZNyydbTHXsnydaWQigMx4pyDKOf137zFldvlENOgwK/tOtRj nS8z7QaVcC9GJlm4SxIcAnBelZ4BBqGocspJmA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On big-endian architectures, the signal masks are differnet between 32-bit and 64-bit tasks, so we have to use a different function for reading them from user space. io_cqring_wait() initially got this wrong, and always interprets this as a native structure. This is ok on x86 and most arm64, but not on s390, ppc64be, mips64be, sparc64 and parisc. Signed-off-by: Arnd Bergmann --- fs/io_uring.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.20.0 diff --git a/fs/io_uring.c b/fs/io_uring.c index 6aaa30580a2b..8f48d29abf76 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1968,7 +1968,15 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, return 0; if (sig) { - ret = set_user_sigmask(sig, &ksigmask, &sigsaved, sigsz); +#ifdef CONFIG_COMPAT + if (in_compat_syscall()) + ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig, + &ksigmask, &sigsaved, sigsz); + else +#endif + ret = set_user_sigmask(sig, &ksigmask, + &sigsaved, sigsz); + if (ret) return ret; }