Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp264790ybi; Wed, 29 May 2019 20:58:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyWBx84mmUB3V9n8c3zwJMNS+VQyCwkQTEQl+aiT9zZMo7tqrX8oimFTyGVB0nCymlSUlSD X-Received: by 2002:a17:902:a708:: with SMTP id w8mr1718632plq.162.1559188711422; Wed, 29 May 2019 20:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559188711; cv=none; d=google.com; s=arc-20160816; b=QLvGIgMFBcDUUTq3s8/9p7EJ+CkoS110irSrK9CfGIbDqGknuJrH7VMu7IMDPj8+eP INJs23Yr0B3KpZBK+UWKBX8vxuOATD4uJS7dcHegFyMnWGTpgr1bpdDFQWEvbT6TT7cL xNpgbd+SWFkujpGeivE0exgl21bmlfJwl2vLSnQPDCb6RhhOXWLKJrCrYGsP8MO/Q0Js dEMvfZN40ul3R6yf+l4obsUL0vikb5aYygSGgc6XVCeJruVQaCiMsarSlzWsWyuYMwfe eCZ/IQMBurdIvaus9xmnR0RJWE94LiuQuZ9VCv23eGzvDpR67sbtiM80k2nHzgM03VfX MZZw== 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=XloOlsrBMUqc/1brlk9rDI6nrk+Ay/75Eh8t+KaPY7c=; b=BOXYGNPoW0MmJxbZMiPY0ZP7hLmVFKqRWCxPT/8TBP2otCxYKJ9aeL8ZNBhe4I638o wSTjIejq7CuLzbbAEyh7dtsaEqnVJ1NEbpvuxgFSS4e8w6PxhoOnPxxiY3xu+R4S+ex6 W2y3IstocxBwKi0kwc644C/sOjZoa7n7yoLfJf/GUE/c8z3UzT1PD1uT0WikjGqfO2qw hEVlrRjS4XfIWB9gg6AOC5U2iHrQmVaY1a4WWDS8DBGT/ScPYm1F/SGqytsGmyfT46Rs GD9nuduxDEcGRooQjbjl4AtF4/t2c581lDww38gVM9IQY1csT+tj+jDQK5YgzFlinp0m 5tAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DYJDZcL+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x19si2056487pgj.92.2019.05.29.20.58.15; Wed, 29 May 2019 20:58:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DYJDZcL+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733003AbfE3D5C (ORCPT + 99 others); Wed, 29 May 2019 23:57:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:52636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731738AbfE3DSx (ORCPT ); Wed, 29 May 2019 23:18:53 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 B300B2480D; Thu, 30 May 2019 03:18:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186332; bh=vraa4DO0CKAQ0cePnddNicGGHZfeaTl86+HfTCh+TJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DYJDZcL++IUImmAe8pLxgZKOfkrvm6/6kWf9NnBZ49GeuICSBpiyNi7llIIBQ41gl fPm2cti1py0qpMWq3H/nD38vSNHV6PVaAboRjwyyUG0gugGtVYyxedlGPklH8IZho9 SGJJSJQb+N8YEh4DavgLfuwnqogE/VHNi03a0ZLg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pierre-Louis Bossart , Andy Shevchenko , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 4.14 052/193] ACPI / property: fix handling of data_nodes in acpi_get_next_subnode() Date: Wed, 29 May 2019 20:05:06 -0700 Message-Id: <20190530030456.821909111@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 23583f7795025e3c783b680d906509366b0906ad ] When the DSDT tables expose devices with subdevices and a set of hierarchical _DSD properties, the data returned by acpi_get_next_subnode() is incorrect, with the results suggesting a bad pointer assignment. The parser works fine with device_nodes or data_nodes, but not with a combination of the two. The problem is traced to an invalid pointer used when jumping from handling device_nodes to data nodes. The existing code looks for data nodes below the last subdevice found instead of the common root. Fix by forcing the acpi_device pointer to be derived from the same fwnode for the two types of subnodes. This same problem of handling device and data nodes was already fixed in a similar way by 'commit bf4703fdd166 ("ACPI / property: fix data node parsing in acpi_get_next_subnode()")' but broken later by 'commit 34055190b19 ("ACPI / property: Add fwnode_get_next_child_node()")', so this should probably go to linux-stable all the way to 4.12 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Andy Shevchenko Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/property.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index e26ea209b63ef..7a3194e2e0906 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -943,6 +943,14 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode, const struct acpi_data_node *data = to_acpi_data_node(fwnode); struct acpi_data_node *dn; + /* + * We can have a combination of device and data nodes, e.g. with + * hierarchical _DSD properties. Make sure the adev pointer is + * restored before going through data nodes, otherwise we will + * be looking for data_nodes below the last device found instead + * of the common fwnode shared by device_nodes and data_nodes. + */ + adev = to_acpi_device_node(fwnode); if (adev) head = &adev->data.subnodes; else if (data) -- 2.20.1