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 BDD3BC2BB3F for ; Wed, 15 Nov 2023 20:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45772440147; Wed, 15 Nov 2023 15:46:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 407FE440009; Wed, 15 Nov 2023 15:46:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CF56440147; Wed, 15 Nov 2023 15:46:43 -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 1DE00440009 for ; Wed, 15 Nov 2023 15:46:43 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E6C671A03F1 for ; Wed, 15 Nov 2023 20:46:42 +0000 (UTC) X-FDA: 81461372244.28.CB92F47 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf24.hostedemail.com (Postfix) with ESMTP id E01DF180011 for ; Wed, 15 Nov 2023 20:46:40 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="HCw+nv/7"; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf24.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 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=1700081201; 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=58mKSc+1OyBLDoCzzP1ugrRvE36mqvlMrT8OqKi+8u0=; b=OfAGFHMbkT0RL0w4lSz+Qfs8caI5/zmXfazI3k5vya+X5/uLBa6WnWshoiWHtQhg/E3Dzt td0oWxn1fZAnGHIN5l1iyDs3Ra6hd0QpLg0AyU2+B4mENZYl8H+kgjElycDfHdxIQN4vuy kGAs0x5MYDr4wUCY0D5SdlLsXy2TrCw= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="HCw+nv/7"; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf24.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700081201; a=rsa-sha256; cv=none; b=2UEXGNGbL6YFhg/Lld4ARQof/cR6dqbTV5pp0mf+pfSel/obf9tD13nyxWYBtqrvp0RlmJ vT8CQ3N4bG/+LVmXS0bs3Re9ghcaVKVUQjc3VnT3pHBGAPdGcs6iyNoFXBodcGEfNDxBgQ qB6iVHwQf+oy2TJG6y1WHcPG0Xiiy6E= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 04908B81A71; Wed, 15 Nov 2023 20:46:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AFBCC433C8; Wed, 15 Nov 2023 20:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700081198; bh=vwn6DTlDFE5q9dtWZF5MxYqwb0JiFxM3PFr579afigs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HCw+nv/7h5kdTZvgz/9bQYquK2n1mXPeoDSNxAMgTwfGH558//pWt6pU5g3aWlT1R qZl0eOQTndkdqAeEmO9p43FIiIjp+V+mwRilW7ImT89stbtpZfLXgOccslKdbY5yDl mCcI1OyBT5PcHJKaSe/WEq3lVxUaV8QsVoydFfBw= 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.15 001/244] iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user() Date: Wed, 15 Nov 2023 15:33:13 -0500 Message-ID: <20231115203548.468560615@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115203548.387164783@linuxfoundation.org> References: <20231115203548.387164783@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: E01DF180011 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 8rk7u6cmpfz6erbi81cefg8bwdjom9ms X-HE-Tag: 1700081200-429426 X-HE-Meta: U2FsdGVkX1+7fPzykxDVec5AMYrU18+peNfHyBJEcyjfjmsqWfAAYIhTu71oBewDHk2Tx3mpKQ0ZJObFgup3GAFY14crjfKcOuDUL9U5XMApnivOmeMHbSWqZmGecoCbZ/tslz3x9Zz/csWXpps/jFFcnqvkZ8Cs3pKURawsLKTNYI41GwZupngEB0HhN+r8fja4g60EO23qbLkAfiqhRsJ6BMG+WXcRQA5VN2R2j2iIMIyqRIDeBpnPZ8eWl/K9ucw2fL5OvQjf/Asqe2PlmRP0gUmbkUPDTlwtCerbwqehu2KAVPmuNjgYZvqPfvQKh7dEJ6lwnT/D2kbygAYEB2KLRLHVpna4xoD2BQlOcwuFRyv3qDSlL3mUIy9UzIA0sWhRcw9A/+x9OTXFQU+lWS0AWw3nMppzqy6tkYvD43ggWnNGXPFziNGkO4rBrS99QBUZbLjbFRzznaXnG8sSn1ZgS+DtbpzVDkkkdky8TR3aPUatamh4khccxs5IEph9qdN0Tsvr+VO6Fm9lVmh4cNk7TZNIJUCse+7rlN4swD4S/BDG05u2jn7bj0uKiFyxIb/EMFNl1RCtwKCmbatB4OEMrrsrY/UADe+u88PZ4zxs3cmX5d6Prjad8CZ4WfpMF9ye8ZtE0vJeE7m/uN2vAHQkFj1R2MfiEruBS3uuwDAz+nnnkVzxMPLx4Y/hcrPiGFcYdlGSSMCbn18a6oljD9jUzNr0pdI39k9ufkXd3KIUjLnOFkaxY4edKbek7X/5m7u/N8QVoONbWnuf86NePSKzhPsOCCLJy10Si9wFCXa5FIctT4bR9FWcvuhwmotcgYlZnTXN5DDmM8nLBKm0RfrfmA7kAyAmDiWy2PL+7GmcYu5teUl44v68ib5faSYpU9CdVAr2FgtigBOdltZnJXBgkRFoMSV/xbUDtG6JbR65XxleFkR0BAaTQjG1r1BavqL2pXNBxpZoNk5QrYB 6oz56r1T ZuwR86Cp59Vrtge4JGPCpWA7zdxUk7A+O5xrxXnZismuCoCRb7gfeSYg8gO+HWbY1As8b5E6T0jIKc2m7jDtY9uVqVDC8ph6aCoeyYdWE4siUFeNS7c3Oj6HHAsfmpXCyLIfliehA1YMSeKzxg3F29xRc9LeGTlWHtR20MAT+s6GR+fmd6KxBlB9xoSHE9142iJ0Z23DE1P2PuTy9zWWnXBH4xqQxb/ik1ZxFSkFJXGvwBCgJ44T6DBnQKOZbjvQUNOwKAYRTtmllxHnYhpseRUGs72IEByl8j+yiFKw2mdg53XI/kRKdvBU36z5dV8fBrZATzSTC/kOyRJ6BqjZ9W2neDZmvwKtgis7k7wkH8pCR/+JfW6WzDzVxMsWJD3yRDwtzs8bVudqTWoKAj3PosBC05iIMfKkbdWuV32JixFDKEMeiSIhVXyZY4QR21Hw9Bzx6RCmi1H9goveg/D6LGWD4zkG+l5ssrOxu7Cm6QCdCcCLKC493RucTk4Dds7yEdLJFuI30ss93CjyxPtaJfKF/Y9EJMmH2m/4etdE8Qk+yck6kW/JmmP+/2/5RgcznSQ/9u74MzeUpnriedIPefzhabppwuuqF8nPyEHpgURKRVJueFPSB5Zxtb0d2oBzUxIhu/V/x+Qv7R85OZrnmvSHG3Tvs5RSqQUjZhHEOpdHfa/JP/FxVz5+DD3zPfgSlpZUe822nq/ys9JBnXQALw2FPPw== 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.15-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 ab5e577373093..3616fd4ba3953 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -543,7 +543,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