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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7385DC4360F for ; Thu, 14 Feb 2019 14:51:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4401C2229F for ; Thu, 14 Feb 2019 14:51:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="L9Zyo6Tb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407314AbfBNOuq (ORCPT ); Thu, 14 Feb 2019 09:50:46 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:41593 "EHLO mail-qt1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439323AbfBNOtp (ORCPT ); Thu, 14 Feb 2019 09:49:45 -0500 Received: by mail-qt1-f169.google.com with SMTP id v10so7082324qtp.8 for ; Thu, 14 Feb 2019 06:49:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jAX1WYClvTF68HOuBDHcjdNU9Y05TUeERF66yDaIHEY=; b=L9Zyo6Tbln45JAT9duHaa+RG+kna2YWVG18IgdQaCAkBuqKBSBxHfhQYFLpRMM8q1K vUa5hlIrngpOLZW+qnMs4VuoUfnCEsQ8QxTdLgJikfw0oKlPGC2wF7N9/vONBVBkHRI8 PLv/3iQp2q0UUqgl74XpHUyWSiX7XrTCpx2A1g+oIOlkL5BsVShfZejJdh3E113twJaL OhOYZRHHWMvpr9PmmDc21N/5M4qbpSzIoNN7B+SPJDKXtYQdPKa0La9A/QihDG27PZRU /YtPIr/EcA97zw3ydKdalfgLpb3aR+9hGt9vP+ZVRlPS8dz0moSsZaR4qJHjdEPTh7zZ w3CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jAX1WYClvTF68HOuBDHcjdNU9Y05TUeERF66yDaIHEY=; b=kqCS65HYgPgTNDCLb7zXu7oAfS8t0IvlGvGR0VHJQT+jp7O0irXI8LySuuWHB+XLLW lCBVXAl43/+ivDX9fzeCwkcJopp36DZDzFZibVPPvMLghGKIIckyeVV8JobaM4gl2zbU 8aT/F6BVrfWsijk+vqciNkwEQGJX3ZPz/Ej15m9bPgOTPTybaWTSHpNFWwXwgOSjtLoo GFAkno6Aem5zZp9n+1dh1fnO2fMk6vFuDhnJRwYORkaWqyJvwDwu1PencBo/HIodSJna ov6mKrZgBHU8r3TSHOZ1cCz9q/nqb4SVsEo8oOHjPRiKUTLXCxu26K2jqSSnyRRGOHMt G2Kg== X-Gm-Message-State: AHQUAuYvfXvmrb5y7UbJ4zlZIBH2Ym2LmbXxlZXXQUhMHO1o82myxFgy 4oWfm7GNbJLIXwjrBRPTI3gUQAwf/DE= X-Google-Smtp-Source: AHgI3IZBiST25lvmOi9NkLs7JajuZ3z+j1YbEwfnS8qIJALn9pNb8XJFarQiroh+0yPSG0KDVtHeoQ== X-Received: by 2002:a0c:d124:: with SMTP id a33mr3194125qvh.19.1550155783894; Thu, 14 Feb 2019 06:49:43 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id k66sm1498919qkc.25.2019.02.14.06.49.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 06:49:43 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.9 08/16] ARM: 8797/1: spectre-v1.1: harden __copy_to_user Date: Thu, 14 Feb 2019 09:49:22 -0500 Message-Id: <20190214144930.27539-9-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214144930.27539-1-dave.long@linaro.org> References: <20190214144930.27539-1-dave.long@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Julien Thierry Commit a1d09e074250fad24f1b993f327b18cc6812eb7a upstream. Sanitize user pointer given to __copy_to_user, both for standard version and memcopy version of the user accessor. Signed-off-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/lib/copy_to_user.S | 6 +++++- arch/arm/lib/uaccess_with_memcpy.c | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S index caf5019d8161..970abe521197 100644 --- a/arch/arm/lib/copy_to_user.S +++ b/arch/arm/lib/copy_to_user.S @@ -94,6 +94,11 @@ ENTRY(__copy_to_user_std) WEAK(arm_copy_to_user) +#ifdef CONFIG_CPU_SPECTRE + get_thread_info r3 + ldr r3, [r3, #TI_ADDR_LIMIT] + uaccess_mask_range_ptr r0, r2, r3, ip +#endif #include "copy_template.S" @@ -108,4 +113,3 @@ ENDPROC(__copy_to_user_std) rsb r0, r0, r2 copy_abort_end .popsection - diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index 6bd1089b07e0..f598d792bace 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -152,7 +152,8 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n) n = __copy_to_user_std(to, from, n); uaccess_restore(ua_flags); } else { - n = __copy_to_user_memcpy(to, from, n); + n = __copy_to_user_memcpy(uaccess_mask_range_ptr(to, n), + from, n); } return n; } -- 2.17.1