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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84BBCC072A2 for ; Wed, 15 Nov 2023 20:53:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1503D44014A; Wed, 15 Nov 2023 15:53:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 10055440009; Wed, 15 Nov 2023 15:53:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F09E044014A; Wed, 15 Nov 2023 15:53:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DE634440009 for ; Wed, 15 Nov 2023 15:53:23 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AB70F1208E5 for ; Wed, 15 Nov 2023 20:53:23 +0000 (UTC) X-FDA: 81461389086.17.7C2321C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id CB9C2C001E for ; Wed, 15 Nov 2023 20:53:21 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=q+zroC5T; spf=pass (imf22.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700081602; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=alo6WX8IT3RiNRDbO24blMHVnIz/YxoEGuC8ffQqtrg=; b=EHDIu+cWu9yfUtr6pleYJ35Qv6Tk3EcdYAZVF528wigersioTvwPG2L80iyjgfqqxwc84b y+DaRio+mCNAltZj/y1mA0BI18ejRrrArXBYBm3qZ3dnL7xRj2Xb/hV4m1juN+1cG2MsX6 T0hiJmj4+bSGnbbMxX/zfOfcckSKle0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700081602; a=rsa-sha256; cv=none; b=hXAcGGQ5gGWHuHXIUjKJdqjPvgwHjvVMU4zJryprYX3u8jLFWcMerPwuMKt2tOOln73H+b uh0nwZCUPze9x4Hd3yUxskz10Sx6HluPigIX5n98zheEAjo2c9NP0Toyt4t4Xm/oRU/PAi gqdYIka6+dNS/7qu7vGYwkYZDSQBvx4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=q+zroC5T; spf=pass (imf22.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id DA30E617D6; Wed, 15 Nov 2023 20:53:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C481C4E778; Wed, 15 Nov 2023 20:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700081600; bh=DzANMoYqeSAvh3deZnCARuxjzAQskL4IaK422nG3KHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q+zroC5T3J/0x2GpWPh0QFkQ3ZHVjwnCZL1HgzakahsIZkQMPaBSGGoHzhtUqekBO VVpA4EbQhy/UsulfXEiGlJc8PQ/mel+rWqowiUaS7ToLgwXaRUOU/gBMl2u84ZbpsA jZDTB6ovrGMLjIOcCFftNPereTM+Z7WS5vAJYxpI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Dan Williams , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Alexander Viro , Jens Axboe , Christoph Hellwig , Christian Brauner , Matthew Wilcox , Linus Torvalds , David Laight , x86@kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Christian Brauner , Sasha Levin Subject: [PATCH 5.10 001/191] iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user() Date: Wed, 15 Nov 2023 15:44:36 -0500 Message-ID: <20231115204644.600507949@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115204644.490636297@linuxfoundation.org> References: <20231115204644.490636297@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CB9C2C001E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: nu1c4tezm39nwur86zhkdtayeg3nkonh X-HE-Tag: 1700081601-919032 X-HE-Meta: U2FsdGVkX1+lyI4asuTZw1clZIDd4I9Jse20cWiEnmOPT8/s/8AgQDQw0nLNbdbeHAY+3uOu7cbk3Kh0X0uHo5kPQyphQ8+cRjgrZeUePDu7DSTry/NIRON3qNm01dLFDTodnJf6qQSQSQzja9xvJvD9kMgYmb23IblKXivRkUpbgKQxmCcfJmoYv1IleCSPrM8WIKRja7wKr/C2aSaiW4cJZCk/L5LJUWDkt6OwRND/IIs/XC6Pe5bLnmrFkIZ0wjfu61r2gn4hZdU8hbY8fBDJyHl8yFfG8udJ6D6AZVDydpBNX5r58BobVvjxkAGblqLPkGMLvvvnIYRrAVsASvnSaGnZV4Zr/pYpS317no/qpoxLXfX1crF7pBsm7OmhRqHmtT784MOD4dMmplXHYnLneG1lC1Mt9n04iJxbwmoo/s/SflyniPrh8Nr5qZTM+VoeNYabnq5fvSak12G3ol3g1Ffl1w5Zx7LKDDg5+mkHzbCdwDH1bx0kfh6/9F+Cl7urybwCzees2mSP5iRMQJZdDleUoYoqj65bu9i9eEhRTSC2ZdroElNGtpymcP2ebJrtuYDfUv4YPX3JjVQWNaw3meYZWxSaKiRcWWHJfzw3L/rNkBufh5S0+vcgMyfnLF78j6Wqcl4AGtTpy1tY7w4EabNXIb/NR5AdQyWuAcxUqZFrQxUyKVD0sYkKP83t2jS2G5n6WHjryYXjQO3GLBNbzCz/Qj+Y7r9AjuW7zhpUNmBYmBtZpDQo53VEXgEmGnTjI0D/aMULoj9tZO+tKZ0dkKQiAMUYeRZx6Xf+riob5ek6T0+zutjJ5C4Bg0JeHBWUxnbQGMdCg8VrUFPLuBWHHKVNodAhgMZzH4M73lbIQa3bNum+gZX/1Mev4p/bFeuMqDg5sj9VEEeVafou4pUPgQkUP3ZADxOckzct+JZvj0BsP7TnGRYO7zMmjr0EtD+Ru0FsLIeBemtkJd6 SRx08DAR vxpnQV+sC+KGEzIMxMsExYfstQQYqJDMJfZiWw37GXDOfjyZrjYpntghHMomqdYDUspf6MDy3jtsnjnfmJvsi4LRRJXG5iIFuzA/BtN0L9WDZNfnU7j8Z93DYkQz48KDHGJc+BDIMxnA4FCtMVytab9OitC36n8CsHHkIvIWBejTDNwji83mj6yT0Z3D4dnMPMWp3IybfJfuvR8vrcjqkKuR1XBQ0j3+7uxtknu4mHfhE//cuPuGkMb2f2yLcks+L6Qx4TxPSOq0gRxNFUKUQUqats8B/Jd0GBOMkhfYJ8pRXaCZEH3Obo9PgT9SsGXMbfkCcsv8fgXGprHM906i9xs1swlH36DlhBa87LhNuPe/MyjrBjY0hhNs6c++uxHL/gGG0PE3kkKWK7rIEhHq5dW7d8iPMCEjXQYwApyqAnxfbXOa5LSKPWuxqFxXQgHv8h+xup2I3SJuGV+GGwrS1QH1BibV+CIkJx77AbUkUTb5kStoWou5KCl7fNvzUodsiR188er7iBC5WXY36b4PlueE3iFpAudxan1XSDqJlTtisUCuql9AjbT12zPZzLeEOR6d4EhViSmLAukpWZ67xTd9YLRI9q+8QXmiZY46iiss0DEn9HVQl2uBW6FQQca1L/di+z1npM3tvhi13eRnvC8S4WOxjv5CsWUXUm6+FmfS7ZoFaNaiJ200wW9SCoUU79zJZ+9ZbR1JQwg8aLX2UyJ5dtA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 066baf92bed934c9fb4bcee97a193f47aa63431c ] copy_mc_to_user() has the destination marked __user on powerpc, but not on x86; the latter results in a sparse warning in lib/iov_iter.c. Fix this by applying the tag on x86 too. Fixes: ec6347bb4339 ("x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, kernel}()") Signed-off-by: David Howells Link: https://lore.kernel.org/r/20230925120309.1731676-3-dhowells@redhat.com cc: Dan Williams cc: Thomas Gleixner cc: Ingo Molnar cc: Borislav Petkov cc: Dave Hansen cc: "H. Peter Anvin" cc: Alexander Viro cc: Jens Axboe cc: Christoph Hellwig cc: Christian Brauner cc: Matthew Wilcox cc: Linus Torvalds cc: David Laight cc: x86@kernel.org cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- arch/x86/include/asm/uaccess.h | 2 +- arch/x86/lib/copy_mc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index bb1430283c726..bf2561a5eb581 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -446,7 +446,7 @@ copy_mc_to_kernel(void *to, const void *from, unsigned len); #define copy_mc_to_kernel copy_mc_to_kernel unsigned long __must_check -copy_mc_to_user(void *to, const void *from, unsigned len); +copy_mc_to_user(void __user *to, const void *from, unsigned len); #endif /* diff --git a/arch/x86/lib/copy_mc.c b/arch/x86/lib/copy_mc.c index c13e8c9ee926b..e058ef2d454d0 100644 --- a/arch/x86/lib/copy_mc.c +++ b/arch/x86/lib/copy_mc.c @@ -74,23 +74,23 @@ unsigned long __must_check copy_mc_to_kernel(void *dst, const void *src, unsigne } EXPORT_SYMBOL_GPL(copy_mc_to_kernel); -unsigned long __must_check copy_mc_to_user(void *dst, const void *src, unsigned len) +unsigned long __must_check copy_mc_to_user(void __user *dst, const void *src, unsigned len) { unsigned long ret; if (copy_mc_fragile_enabled) { __uaccess_begin(); - ret = copy_mc_fragile(dst, src, len); + ret = copy_mc_fragile((__force void *)dst, src, len); __uaccess_end(); return ret; } if (static_cpu_has(X86_FEATURE_ERMS)) { __uaccess_begin(); - ret = copy_mc_enhanced_fast_string(dst, src, len); + ret = copy_mc_enhanced_fast_string((__force void *)dst, src, len); __uaccess_end(); return ret; } - return copy_user_generic(dst, src, len); + return copy_user_generic((__force void *)dst, src, len); } -- 2.42.0