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 84972C2BB3F for ; Wed, 15 Nov 2023 19:32:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E596E6B03B5; Wed, 15 Nov 2023 14:32:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E09556B03B6; Wed, 15 Nov 2023 14:32:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA9E06B03B7; Wed, 15 Nov 2023 14:32:09 -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 B838B6B03B5 for ; Wed, 15 Nov 2023 14:32:09 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 889C7B5658 for ; Wed, 15 Nov 2023 19:32:09 +0000 (UTC) X-FDA: 81461184378.04.3CAACAB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id 7E4B24000B for ; Wed, 15 Nov 2023 19:32:07 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=GRhkWicR; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf01.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700076727; 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=28MDc3em9Dbydu3yx/aOFmXoJtSULXgAqc4xRtAnDfg=; b=5oSOg48XyIyRnw5r8vkLu6GOSOe6XWocus4ljsCVxIo4Izc2PFrZu74HFXQTyA0N8LrByp Ke+576JBDUkQrxkEROf6Y271hek37Xe8qZU62OD1lVP4D57mdwPUwuusMjFAc0hfbblYZD 0e/o6kncYSiMiLGH2OF+RAirY4qbVgM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=GRhkWicR; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf01.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700076727; a=rsa-sha256; cv=none; b=gkkFDaC1MkXyHBqzFsB9WsVikR+3BN9shtNWTfcYUrZTZjZqT5WifWJEUyAy9mHLe1zKDY /A+qkflr3Ajkksh/TbHQCzwfiMu+/eIoDQASWJiu9XCJHAfxGz5+zUBsC7kJhAOn9BQNxC fs8irQqBEBZTRdd+9/Jk3yc+0aSOPGg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6E3E0617BA; Wed, 15 Nov 2023 19:32:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9714C433C8; Wed, 15 Nov 2023 19:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700076726; bh=/SprfMK39MSgjFMiw1J9eLDIGszjDz0qV1aULbNTrEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GRhkWicRGHlhuy4qerN5tCddLAbW7XCL3Rh6aA0CvBnGPkqW/07ma0VOUUjSFyySy MjXtleRf43suihpbvBPSO/V+3IZQAIzxeNnIx1+AJI4SIUlCooE3KtEo7n4l5lqk/3 DkBCYKGsDBe3aCI+DPvm8BF52g1ROoLegiG7CZXk= 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 6.6 006/603] iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user() Date: Wed, 15 Nov 2023 14:09:11 -0500 Message-ID: <20231115191613.572325746@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115191613.097702445@linuxfoundation.org> References: <20231115191613.097702445@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: fmbzhzb1hjmkhydgz9rcma18euk6zb46 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7E4B24000B X-HE-Tag: 1700076727-368638 X-HE-Meta: U2FsdGVkX181LlJ2HkCOooC3aHk2X2UsYFPITUR742B8/VsZ30XdXemOKCCKTqAA/EYwphIivQPp7nFXGxumyiU+iPWIO18113CXVvunPgTOyk7z5+tC5fSfy9CqvTzVhXuQetWATkV4wLsrZ9YvPGOsTAXQDT8lvHHq72nW6KKIzTN7Qu4NAnc/zfeHx1CaQhGk3i4eAvHi+uUU67xaLVCUQ9YHfdF1RZjVmjO3koiJqD8nHFl9lpehK34iZySD+jcX2Wyt+B0unn6RFYJjptQC6DBO5NqtIWA03dizkR3OAx1ep+10SGKtv395ni4/e0aJ4WedB5+7+YesNHQTF5zTllj3JMs2z5YfDXS6WWiTo5yhcXzSu4jegNuypcNOfTSKWXAXz1+e4ApuBsdoErnpKHbEKgiKgvRpc1yqyKA43+j3vAwvXUqUf/FPzFmdQLnJSAkbjEyJbQcQ/ZcKeOqaP1PKr/1r36U/5diimLluTkhff3uIu6czvbvC+L+zNdUz9wm1VvWA/mHAdyuGzC6JC5Af6Ba7KJp6is9bZk6KUC5+XhakX0lum5wH4n9VuigFqGyWuGtbPr8qqJQp8u02H5cIWNtBuw5DysoJxeCG74ShRJTQ4o2F9NJlA6clMVn1z/SCdn0Zg7MxXOrfW0mFheYAe5eY/wFkU6RS+7m5M3HCURx/kcwNvvONab987sLAcFY9oXmM/O2tj2eVgG6NQ9UxAiYJZGFGttnuwVy5965SoII5WZMxF+++RANPEImuSkXWg9h7b1A/HIxVuQjg501D4qdfI7RlIvrvShgDC86KF5lFFKXsbw2GUnmB8FciYKc/iTSOMd1aHmyeBiNwOKDUpjllolf+czGZRviFk9UL5DF4/+aByd+DSJZBbdwAC3bGpvS6eZx1EToQCkYHb8rqrH0iJ6i1cpi2Jmw74Qh39YgU2d+KjY5pabRaOseJ/rjML/OL+UOUKDw DfXRNcCi XlmmBmUEsmOQHT1l+Kwl8K+yN6mhO9SoU92DgjmvMOgenLf8TqJA83XhClYWWWjmYnmZZo7ScTmBtN6U0PhdiZDPbi8Gx2tFzm5YfP4Te9hBWK2zQ8wxOLbLWcSAgCSKkesaergAmEo7RvUCIGz1TsaZEtsrt71BNYUGmrKLa+Cv/hiBlQ4aHXrLGvjj1CF2KfbLPwkvqNakcALPgiAHt/8Eiq5m0viVnv60aViCd+bSz3AE5DIBAZyJeBKr3G3IxGBJ8m8yGNDGphDmmUeuf7rlQHzb9HadMBbxhaHM+jbeyeu+3njNXoUeQJwh2o/LwytEHy1S9KWpz89/p58ic7kezvKNXL2TCERlPcCEwvGDwKZyg/Bf4Ig0vchPnoLOyKs7OQo4hiigjhNiFKw1wvi3g6yOVPnjW1/7ni09QLRzs9dz3KqgfaE9Zya71UpAKlpGzY9prS3XPo2c/Iw+5mXLYRIob1gZesicvxtX7tkmiyedrmgBG9t01KBT586SVu4sVFtotK8IOX+e/KBxY7RoIX9N3JzOCYHM9jwYtflOscCVLBgmtD+CRS35AyAEHxug09dfXz1jW/TXOjlotQrWfDleHSHp+2i48c9BLDk4CH0zXXZla3iKky80LJRr4TGyWrEL4HQ3BWHc47ZwHutwQ+/PjgIshA6zlbxdqNMQ4bflk1QBZTipo3iEqqVT6Zp1xgQTEufrXIYfnQLMTpGZDBQ== 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: 6.6-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 8bae40a662827..5c367c1290c35 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -496,7 +496,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 80efd45a77617..6e8b7e600def5 100644 --- a/arch/x86/lib/copy_mc.c +++ b/arch/x86/lib/copy_mc.c @@ -70,23 +70,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