From patchwork Fri Jun 19 14:30:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191242 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp666082ilo; Fri, 19 Jun 2020 09:10:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDHJBM5/6mWLrhWBAheIcoxb3Dspz4frlDRu+pId/JbS//MEvE4nbrs7244eWfLxUF0j1Q X-Received: by 2002:aa7:d9d3:: with SMTP id v19mr3946977eds.364.1592583004230; Fri, 19 Jun 2020 09:10:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592583004; cv=none; d=google.com; s=arc-20160816; b=hk7J58PiWWprBo/JtMmre+ehXXp7XbFlKg7kHwcQBui6/KqtBxqCflPCVbLQk8MUBO IfdhkvmDkdGDWyWwpvnNwh9qdDY1qjzBxptxvtkIfNdIFvgJZWWe1BCre9YOFWiYAr3c ihoIseGGbkrxe0qXAz50qqr8/v8uXEDub/pdiYsyilGpPmFE+MZ7O0JKQxsp8/Xg521O Rimco1ty6OljGPtjZ/VLc04YpgGNOJMzzdTGaSs5r0r6Y4Fk9u5+hb/NPA5MWsswamrQ bgCvWQT+OYahLY/1JOOL9jaHyhBach88WyYyav2pvzivjoisXWnXAukqtA5lT+NEi2zT 6Iag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JyQ3X2TiDe+fHFyBZX6VluAjQK6hIr5E1IdwkkGi8y4=; b=0rqZdX3Noi3i7gKqyzYc7tyD01HEI9CWUW+S1YK1lKVWRlX9xVfm6fU6QxmHwWjnDe Kxde/vDlVZl+BcENke0jL44TpptJBQWxnIu1XpTF9vwd3It3t2ZVmHidsF/oEMzCGKfY jdXt70tYc3XOULaonB6HvjI96xpudyhARqo9OwH1PKgWWu3j/uaECALOB6vhhDe5Rqvx rsztdUaYzQCBbxyEKX4vMUhd4fYTq9Sjk5hOA/toUgjsGL6bnbIR4WnxTr6t9jgmQcTM XSOAljBl6RyzVmBX12JRcWA9l4u7fH9+YWvRH9EIsHiCyoVSVj3MdE7Kgam+RMUtOCdX VzWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NK9nSkqC; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ch8si4306309ejb.345.2020.06.19.09.10.03; Fri, 19 Jun 2020 09:10:04 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NK9nSkqC; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390426AbgFSPGt (ORCPT + 15 others); Fri, 19 Jun 2020 11:06:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:35970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391088AbgFSPGq (ORCPT ); Fri, 19 Jun 2020 11:06:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7171121941; Fri, 19 Jun 2020 15:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579205; bh=asa8ONHvLvSLrkUv5RGqx9vJCcv05F7tTMtmQgGoEZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NK9nSkqCX5DQKwz3IF+DHL7Kn366YQAwlB+vjQPvcsCZgIWIzeicDIF+FTFDI/81q I0Yunxqxot0agvSe0pE5yE5DAHNlS2D5CsDQbNOVE4HECWWPaQBkdxBVYQSCnM5tSk ArGs55p4Wpvg2h70e+sO94to9IHqBTMyWTwq0mfk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Florian Fainelli , Linus Walleij , Russell King , Sasha Levin Subject: [PATCH 5.4 047/261] ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE Date: Fri, 19 Jun 2020 16:30:58 +0200 Message-Id: <20200619141652.180953938@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit e1de94380af588bdf6ad6f0cc1f75004c35bc096 ] Recent work with KASan exposed the folling hard-coded bitmask in arch/arm/mm/proc-macros.S: bic rd, sp, #8128 bic rd, rd, #63 This forms the bitmask 0x1FFF that is coinciding with (PAGE_SIZE << THREAD_SIZE_ORDER) - 1, this code was assuming that THREAD_SIZE is always 8K (8192). As KASan was increasing THREAD_SIZE_ORDER to 2, I ran into this bug. Fix it by this little oneline suggested by Ard: bic rd, sp, #(THREAD_SIZE - 1) & ~63 Where THREAD_SIZE is defined using THREAD_SIZE_ORDER. We have to also include since the THREAD_SIZE expands to use the _AC() macro. Cc: Ard Biesheuvel Cc: Florian Fainelli Suggested-by: Ard Biesheuvel Signed-off-by: Linus Walleij Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/mm/proc-macros.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 5461d589a1e2..60ac7c5999a9 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -5,6 +5,7 @@ * VMA_VM_FLAGS * VM_EXEC */ +#include #include #include @@ -30,7 +31,7 @@ * act_mm - get current->active_mm */ .macro act_mm, rd - bic \rd, sp, #8128 + bic \rd, sp, #(THREAD_SIZE - 1) & ~63 bic \rd, \rd, #63 ldr \rd, [\rd, #TI_TASK] .if (TSK_ACTIVE_MM > IMM12_MASK)