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=ham 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 E709BC43444 for ; Thu, 10 Jan 2019 17:52:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC0362173B for ; Thu, 10 Jan 2019 17:52:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="WUCZy8f1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730455AbfAJRwH (ORCPT ); Thu, 10 Jan 2019 12:52:07 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:35255 "EHLO mail-qt1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730549AbfAJRwH (ORCPT ); Thu, 10 Jan 2019 12:52:07 -0500 Received: by mail-qt1-f172.google.com with SMTP id v11so14314204qtc.2 for ; Thu, 10 Jan 2019 09:52:06 -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=WUCZy8f1BSH+sPmVcr2/btSvnRLljKRpk9Tb3KBEV2FJPHpI5PUSJUuwxe7ry6pmH1 NAfK8E8BmGT661BZuVyoExpieMepiivnOr9BaBgv5oJfKLzlPijLrPEIDZ5T6oC+Dbl1 wPt901JSvYAc8VwJ3Tpd1ha+4f994qEljFrXA= 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=Z468h+8LvA3d2JfHAb5HQCHUp5OtLHEVgDfQme0aVsL+FBUHgseRIoAHHadirqG8nG 0LQ+juKKWdRQP8lQQdmyUQwPDkjy2DkOdMEGFomvFrzSJAHuzQndODtHENrHcu4HlSPE tvsFJcL9ul4+TN4fl0l9vyfqTO79XTntUwxJSAYQYL2XuoghCy7iOwVF0ES/LBlTc+Io g2/3PtU9DidRYuUYeNFBQArIz6xrB0JfNkcWpcIZR19gvEJQnV0ERWCtSaycACbU1Qfi x1D91nCm0OUqgpAwJmCgRt7H6jfYEQf2At8Lu8WjeDjkxvdhxS1jMHwDAm8wVeDIMvco xLZw== X-Gm-Message-State: AJcUukfteMashIHUWnBchg9yOdZcaSeMAWNqFVB7eDF8dSz64P4CepZo mBczE5plZZrON/75ZBqKy8/pocwg040= X-Google-Smtp-Source: ALg8bN7bBCLkIpWTKRwRun7BQUsTE1uldGzdL8es1VHOPni3i42f/pzpZV6++odKjsklWxjcKe/slw== X-Received: by 2002:a37:4145:: with SMTP id o66mr9823783qka.129.1547142725868; Thu, 10 Jan 2019 09:52:05 -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 b8sm41815904qka.79.2019.01.10.09.52.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:52:05 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Mark Rutland Cc: Greg KH , Mark Brown Subject: [PATCH 4.14 09/17] ARM: 8797/1: spectre-v1.1: harden __copy_to_user Date: Thu, 10 Jan 2019 12:51:42 -0500 Message-Id: <20190110175150.5239-10-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org> References: <20190110175150.5239-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