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,URIBL_BLOCKED,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 DEAFBC10F00 for ; Thu, 14 Feb 2019 02:11:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF1A9222A4 for ; Thu, 14 Feb 2019 02:11:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dwwaIIhG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389932AbfBNCLf (ORCPT ); Wed, 13 Feb 2019 21:11:35 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:33357 "EHLO mail-qt1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393990AbfBNCKi (ORCPT ); Wed, 13 Feb 2019 21:10:38 -0500 Received: by mail-qt1-f182.google.com with SMTP id z39so5238545qtz.0 for ; Wed, 13 Feb 2019 18:10:37 -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=cmHxjX3QWGEzbd3gID8OLJBVtbh3tUIgNET1gXVqzGU=; b=dwwaIIhGhe/W4fv0WLGZipxrqaTJg/oyBGMzOQ5IfacD3zPcmv4vwj2uiHmFq9QWNy 5JPvOiad9GUL8bC6P7oGHiMR4AOxVlE+P6E39igFBrB3pv2Pczr92iGqyI4PjKPJUPpA x65m/MqQN62IhgWMpwGrc9yaparmdeII9TdnaREM2oxlvLC2b9otDSgIFbda/Ss1RQWi ebi9XIa3aNFeKyYxRH2zfPQxZUpgGd+Pz1OXmex5llrU44lvLBCSqofmN5iNmaEYIg6L iBtT7a28KDuwKj9c1a/8a6UXU1IWpGSth6KdlcLG72/qpZhy5u6q2WiPowFbqTfihKYe qMFQ== 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=cmHxjX3QWGEzbd3gID8OLJBVtbh3tUIgNET1gXVqzGU=; b=rpiVTChozjSA80SWfaIs23j2IaCQfJPB8zecai8V7QgITiP7KkxQD/NhQ3sA6c19bI INwSuvkbnYbN1l77jspLPIjWm7RcvvZ3UhKND8iqfcoT8dPNk6b4c+scmfZFtCqfNRqX TqD1es+ZYL8O1wObR+En16uh87MesVUoPpy88/IyjukobU33M6rdWwkMj48HvRyH5pXh eJLgm033K0POZjgzfFZFn+jZwnLiOEsGndYQPuPZHMYGgUu4HNz1FMMTI6y+ZrP7jors 47ogrvlQBcFTuRPmi/DA5Stk6k5OfLGYevN7FyT96PIBqHZm9qCdUBIUHPWBLIGE1/KH KXkA== X-Gm-Message-State: AHQUAuaHcuiHp4ujpxUDmLiR/qv13lxgJynvY61fs+Wvg2Dsok8a/ENr iQvftJVhXvCZ/9S/kZW76fJZTTsHKAw= X-Google-Smtp-Source: AHgI3IbOJ0G/C9jKSa9gSfu5KY19PNsZDByWcebqN0yAJbWGCFZfEZvLsjhYnORACPzBc8i4S0rGeA== X-Received: by 2002:ac8:34ed:: with SMTP id x42mr1062788qtb.173.1550110237197; Wed, 13 Feb 2019 18:10:37 -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 d63sm1091575qka.22.2019.02.13.18.10.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:36 -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.14 V2 09/17] ARM: 8797/1: spectre-v1.1: harden __copy_to_user Date: Wed, 13 Feb 2019 21:10:14 -0500 Message-Id: <20190214021022.5313-10-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214021022.5313-1-dave.long@linaro.org> References: <20190214021022.5313-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 9b4ed1728616..73dc7360cbdd 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