Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3517411pxf; Mon, 15 Mar 2021 11:18:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIqRgH+ySFQme+5fEfPgzlYr/si/ksBno2llJWrDeOIiIUZlG1ODFS1p9jzdAmhJKmbtqn X-Received: by 2002:a17:906:2786:: with SMTP id j6mr9429975ejc.157.1615832287835; Mon, 15 Mar 2021 11:18:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832287; cv=none; d=google.com; s=arc-20160816; b=JEL3NagDi6AspLrtyfQM7VE8k32zc30CV0dMgqxUEc4Q2QFkh6wd5YvVWvzLYAOez7 aA2jsLPud+jJYEUaOiEVRSpVUpO5BOBqpEi23XAHE3XsuKA6suud6rIW9fvvYvIW9Fl0 6odbNVNt2/dm0TUW6+budeG5RsyC0W2TQe1iOyew21d1KXEjDnelLfUITcBg6VkRsAME vWguoP+QyArnyK88+HT/bOvD19CtnUO6SRjqYLtH+rlHuejNUMd43V2GmZO0pjZPlHRY D4upNiJpPaMwUM5W6xegHnT07g3Db4ZlpeDDK8Rvz4aQ7LKElhsKFyRAh1i3JL+nDJGR 8amw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VM5q56xpXH+YpTKkvGzwar14x7s0nODpD5FMF+1Chno=; b=KETK3bV0IZaD+ox6dlSh+XznuchMTD5ZWiDCnBdPADMC48DJ4GvWdlp3y2j/gwVcc6 DoSqRe+1WLXJC0z9AGdyZerutzH6C+3ZQg/ceWnWmCdvbRhpJvdYvZ4fbYTA9QatVfPd j772pJrVzGjRwF8CuoIj3muYqQsWSvaGFQvdg15eEaNI+GNNQPPOldyTnL/EsQAHKNmO EoUAC8kvU+YvMPnnjUEv9s0APSH2q8UMLxR+OwnORGDFhOXaradg3nw7dVy14fFRXJ8r NRtNUc4YrWCOQbSnm+UtUD7c/QwSv0B5EogRylofl24MLsIB8scQ3Y79idfnk2aFSmNx NcwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="E/vhvx3o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hd8si11218628ejc.78.2021.03.15.11.17.45; Mon, 15 Mar 2021 11:18:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b="E/vhvx3o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236944AbhCOORA (ORCPT + 99 others); Mon, 15 Mar 2021 10:17:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:36622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232431AbhCON7Q (ORCPT ); Mon, 15 Mar 2021 09:59:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 04AF564F64; Mon, 15 Mar 2021 13:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816736; bh=kqGk0XuYjjRsOWNK4lG836j9SdgxgTuwrNWE5f5K6Ik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E/vhvx3obdRSrTgaCTr6ewk46R16fL1Fwj5sRP9wzPHcmhc9jymFcotLm+qgKAwLC ulGZQpqwpig/otUSYjslM7JrK22vnnNu0+nxk8RvaS/PRXv+q+xPRYJZe23NjsMZ4G z5jno6lVty2+NmLYyjVCUW+vHRITNJJSLYylak6E= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jann Horn , Christoph Hellwig , Catalin Marinas , Khalid Aziz , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 076/168] sparc64: Use arch_validate_flags() to validate ADI flag Date: Mon, 15 Mar 2021 14:55:08 +0100 Message-Id: <20210315135552.886580091@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135550.333963635@linuxfoundation.org> References: <20210315135550.333963635@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Khalid Aziz [ Upstream commit 147d8622f2a26ef34beacc60e1ed8b66c2fa457f ] When userspace calls mprotect() to enable ADI on an address range, do_mprotect_pkey() calls arch_validate_prot() to validate new protection flags. arch_validate_prot() for sparc looks at the first VMA associated with address range to verify if ADI can indeed be enabled on this address range. This has two issues - (1) Address range might cover multiple VMAs while arch_validate_prot() looks at only the first VMA, (2) arch_validate_prot() peeks at VMA without holding mmap lock which can result in race condition. arch_validate_flags() from commit c462ac288f2c ("mm: Introduce arch_validate_flags()") allows for VMA flags to be validated for all VMAs that cover the address range given by user while holding mmap lock. This patch updates sparc code to move the VMA check from arch_validate_prot() to arch_validate_flags() to fix above two issues. Suggested-by: Jann Horn Suggested-by: Christoph Hellwig Suggested-by: Catalin Marinas Signed-off-by: Khalid Aziz Reviewed-by: Catalin Marinas Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- arch/sparc/include/asm/mman.h | 54 +++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h index f94532f25db1..274217e7ed70 100644 --- a/arch/sparc/include/asm/mman.h +++ b/arch/sparc/include/asm/mman.h @@ -57,35 +57,39 @@ static inline int sparc_validate_prot(unsigned long prot, unsigned long addr) { if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | PROT_ADI)) return 0; - if (prot & PROT_ADI) { - if (!adi_capable()) - return 0; + return 1; +} - if (addr) { - struct vm_area_struct *vma; +#define arch_validate_flags(vm_flags) arch_validate_flags(vm_flags) +/* arch_validate_flags() - Ensure combination of flags is valid for a + * VMA. + */ +static inline bool arch_validate_flags(unsigned long vm_flags) +{ + /* If ADI is being enabled on this VMA, check for ADI + * capability on the platform and ensure VMA is suitable + * for ADI + */ + if (vm_flags & VM_SPARC_ADI) { + if (!adi_capable()) + return false; - vma = find_vma(current->mm, addr); - if (vma) { - /* ADI can not be enabled on PFN - * mapped pages - */ - if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP)) - return 0; + /* ADI can not be enabled on PFN mapped pages */ + if (vm_flags & (VM_PFNMAP | VM_MIXEDMAP)) + return false; - /* Mergeable pages can become unmergeable - * if ADI is enabled on them even if they - * have identical data on them. This can be - * because ADI enabled pages with identical - * data may still not have identical ADI - * tags on them. Disallow ADI on mergeable - * pages. - */ - if (vma->vm_flags & VM_MERGEABLE) - return 0; - } - } + /* Mergeable pages can become unmergeable + * if ADI is enabled on them even if they + * have identical data on them. This can be + * because ADI enabled pages with identical + * data may still not have identical ADI + * tags on them. Disallow ADI on mergeable + * pages. + */ + if (vm_flags & VM_MERGEABLE) + return false; } - return 1; + return true; } #endif /* CONFIG_SPARC64 */ -- 2.30.1