From patchwork Tue Nov 3 20:36: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: 320463 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp4914082ilc; Tue, 3 Nov 2020 13:10:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYrCQ1tGht8xspWhhGSaRWDsls5z0u0J/lwMrrYIXfFnU0QgTrz9wNU5vzt+LRK1jUzPMP X-Received: by 2002:a17:906:5e02:: with SMTP id n2mr12701961eju.295.1604437811394; Tue, 03 Nov 2020 13:10:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604437811; cv=none; d=google.com; s=arc-20160816; b=ye7GaMwEobqYDDYMrD9KW2OygA+ljQX1sdIkQ2vLtpfMW/5NhYC1JGDp4bx6xIy6mY 6y/UTW6IZVXxJBHOE/HWQlMd7S25No53j3RwVfAQ1wYYx3X7VLKDEcPSdhlBr4f1XElL cpwn9nghCGoBBxPn51YnO6jW0Y1vwqmv4Mi3sve13jZhLuWDIWTiaWEp/MeVzOcSvUfb DnBI3nkC2MUKNdSsbY21Mtx4WS5YbbaaBbHnaCeIIwIzafbeL6lZ5yDmu5e8y5MFqYz2 IKuYwt3tO3+6YhZOdGqrN+9YiLcFmsYBY3pFzm2wMFHzmh5FNhlvbCfLuSJn4OoUVOpq U8Qw== 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=E4PBegGJN7hRdXbU5eYnhRX/sOvaErlj3BXB/2rmiO4=; b=lZMYR8bhs0FFMtHotbxuGfywMO5omfSQbwQrOUDCk0yfRBHuikQQ8YqW69Xpiv+VKx OgWyEFtdtd+ik+y9XdedBfae27+bStTm9GutIasYjDsan1D+Wj3r/JhzO3uCuEiMaiOx kG9nTZL+uAI+6T2SxgZUi8OYi7NplmTejEt82RWH15H9+GezAoxW8ELSdG+PzLMM6Re2 Pe/T9vVqSUxlIlA4WN5B3NBmgdY0xqzfWLi1HB6/8YvpLQoL1QKniWThS1WECFnIE8Z3 9hQhfhYU3YpRsgrweoC0wO5U2MWjnfxthcBNmEhC+vU/KgoskQaB58cslWY5g5aULTTP xGyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=G0aq8bw5; 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; dmarc=fail (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 d8si13553688edn.471.2020.11.03.13.10.11; Tue, 03 Nov 2020 13:10:11 -0800 (PST) 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=G0aq8bw5; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388687AbgKCVKJ (ORCPT + 15 others); Tue, 3 Nov 2020 16:10:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:50760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388685AbgKCVKJ (ORCPT ); Tue, 3 Nov 2020 16:10:09 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 377E5207BC; Tue, 3 Nov 2020 21:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437808; bh=2/23HpYEK8fgAqD4gKYgY/sJyE6NbtFuKOrTDv4vYYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G0aq8bw5tNpSO1WlmUBFKOvsKm5W3uQTA+ZoScKP7kDQw0ixHFpNZgs6rJv2pKG/M 6A3RUAZJ3dvJpkMxkgpv57G0d1yZDLsU4M3JtV/46mTQ6H/6AndqAECq2BxMcypFKO SAVWgAq/S420g+WlTGXxpOjizHswPYO29ZlXytt0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Barry Song , Hanjun Guo , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 4.14 041/125] ACPI: Add out of bounds and numa_off protections to pxm_to_node() Date: Tue, 3 Nov 2020 21:36:58 +0100 Message-Id: <20201103203202.946586057@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203156.372184213@linuxfoundation.org> References: <20201103203156.372184213@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron [ Upstream commit 8a3decac087aa897df5af04358c2089e52e70ac4 ] The function should check the validity of the pxm value before using it to index the pxm_to_node_map[] array. Whilst hardening this code may be good in general, the main intent here is to enable following patches that use this function to replace acpi_map_pxm_to_node() for non SRAT usecases which should return NO_NUMA_NODE for PXM entries not matching with those in SRAT. Signed-off-by: Jonathan Cameron Reviewed-by: Barry Song Reviewed-by: Hanjun Guo Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index a7907b58562a7..986712fe2a71c 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -46,7 +46,7 @@ int acpi_numa __initdata; int pxm_to_node(int pxm) { - if (pxm < 0) + if (pxm < 0 || pxm >= MAX_PXM_DOMAINS || numa_off) return NUMA_NO_NODE; return pxm_to_node_map[pxm]; }