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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05B17C76196 for ; Sat, 1 Apr 2023 01:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=D8XLL8bC4CfcxpeJX7BmX829MksRcNW6cIReTbH1JY0=; b=W/shdehROfi5aT 52eIozIFz7lwtVGfzGpREf94hlCCcQSok9p93c9fuozBd+FhqD6F71G6rgBIF0DzgjtNb6IRzM07R GvcmuJu7eYP6DgRYoIDzZ4ZD6QSbdfBVnREKVEngj8k2X9zQo4gfaTvSXe6UWn3qxLHs9bfLsdJjl Eo1p3RapJ/OaDjxqUF3Pd4KKx0QzkSwOcbUnP+FS6vXfuGfxtHeNh/M78nznpmYgNPgeZFcdwbB46 F/Ep6rl89BY6F2Wa0F9vFjrvRJxjxgA3sK8Z2E8kDnJQbgq3DTYFsdrWsymBcBp0DShk9BSEmKThI jhN/4v84JoM2R9pctn3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1piQGX-009U0L-19; Sat, 01 Apr 2023 01:42:49 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1piQGU-009Tz8-0f for linux-arm-kernel@lists.infradead.org; Sat, 01 Apr 2023 01:42:47 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C119A62D0B; Sat, 1 Apr 2023 01:42:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B90E4C4339B; Sat, 1 Apr 2023 01:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680313364; bh=DEWe0jkc9Y6r28LdFAGOYrRGMnBiZ+L83NWmkJE1QTM=; h=From:To:Cc:Subject:Date:From; b=asZjXLGiDmJAsd72cA+rkXBw9WYAzv7z1F9mmGYNBWZKBvoaWW2kG7Hs9d2jWgRoq 5NnnBtNjavw7wsAYBJ/nh0/F0H9nkGZUvCII3+X/N0bXY6iXucjbXQ9NdGLkcg1kgH IBFZsQXMayP0J/12qswcsTgiKrkFPDnl8djMZvXWf2qSILzz3OUdC4PLGVn9CUoTUE WJtoHtFYsBp+qVuM8/wPGPh9XuIup1efLRbuJykSFfFvqXBQuj3msSI+MCWnlZafkl Y9V8a7FZyJAD8N7nXaZ91AGEv/5r4HmvgxGwjoGSIB3LX9Enm75UACJaS0HNlTH164 S3LtF6OWaA5GQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrew Jeffery , Zev Weiss , Arnd Bergmann , Russell King , Sasha Levin , linux@armlinux.org.uk, akpm@linux-foundation.org, anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 01/24] ARM: 9290/1: uaccess: Fix KASAN false-positives Date: Fri, 31 Mar 2023 21:42:17 -0400 Message-Id: <20230401014242.3356780-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230331_184246_283902_9688F2CC X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Andrew Jeffery [ Upstream commit ceac10c83b330680cc01ceaaab86cd49f4f30d81 ] __copy_to_user_memcpy() and __clear_user_memset() had been calling memcpy() and memset() respectively, leading to false-positive KASAN reports when starting userspace: [ 10.707901] Run /init as init process [ 10.731892] process '/bin/busybox' started with executable stack [ 10.745234] ================================================================== [ 10.745796] BUG: KASAN: user-memory-access in __clear_user_memset+0x258/0x3ac [ 10.747260] Write of size 2687 at addr 000de581 by task init/1 Use __memcpy() and __memset() instead to allow userspace access, which is of course the intent of these functions. Signed-off-by: Andrew Jeffery Signed-off-by: Zev Weiss Reviewed-by: Arnd Bergmann Signed-off-by: Russell King (Oracle) Signed-off-by: Sasha Levin --- arch/arm/lib/uaccess_with_memcpy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index 14eecaaf295fa..e4c2677cc1e9e 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -116,7 +116,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) tocopy = n; ua_flags = uaccess_save_and_enable(); - memcpy((void *)to, from, tocopy); + __memcpy((void *)to, from, tocopy); uaccess_restore(ua_flags); to += tocopy; from += tocopy; @@ -178,7 +178,7 @@ __clear_user_memset(void __user *addr, unsigned long n) tocopy = n; ua_flags = uaccess_save_and_enable(); - memset((void *)addr, 0, tocopy); + __memset((void *)addr, 0, tocopy); uaccess_restore(ua_flags); addr += tocopy; n -= tocopy; -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel