From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbcBVOuy (ORCPT ); Mon, 22 Feb 2016 09:50:54 -0500 Received: from mga02.intel.com ([134.134.136.20]:42279 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255AbcBVOuw (ORCPT ); Mon, 22 Feb 2016 09:50:52 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,484,1449561600"; d="scan'208";a="891775645" From: Heikki Krogerus To: "Rafael J. Wysocki" Cc: Mika Westerberg , Andy Shevchenko , John Youn , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] device property: fix for a case of use-after-free Date: Mon, 22 Feb 2016 16:50:41 +0200 Message-Id: <1456152641-127948-3-git-send-email-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456152641-127948-1-git-send-email-heikki.krogerus@linux.intel.com> References: <1456152641-127948-1-git-send-email-heikki.krogerus@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In device_remove_property_set(), if the primary fwnode is of type "pset", it has to be set pointing to NULL before calling set_secondary_fwnode(). Otherwise set_secondary_fwnode() will attempt to set the fwnode->secondary member after the fwnode has been freed. Reported-by: John Youn Signed-off-by: Heikki Krogerus --- drivers/base/property.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index a163f2c..ddf2987 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -820,7 +820,9 @@ void device_remove_property_set(struct device *dev) * the pset. If there is no real firmware node (ACPI/DT) primary * will hold the pset. */ - if (!is_pset_node(fwnode)) + if (is_pset_node(fwnode)) + dev->fwnode = NULL; + else fwnode = fwnode->secondary; if (!IS_ERR(fwnode) && is_pset_node(fwnode)) pset_free_set(to_pset_node(fwnode)); -- 2.7.0