From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E42B1C33CB1 for ; Thu, 16 Jan 2020 16:46:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B894421582 for ; Thu, 16 Jan 2020 16:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193170; bh=UamV5Q8Q8gJKB4pMHysaybJwmbtlpHw38APEO/EgeAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c4Ln5eyfLaXqtdQdco7s5PHtiKLAFmPnjAqojR79Y8SEF3l/6HuUsrXD7HVXrLIwn D+yXOm8Ej0wiJEbripA1szjq2XnsgEexOgP/LLKCONFaekLAI/eady3FUTi7bRwHtd SNEu5O7V3mw6tQOjpAQzpc1awYql7eTXrahA2AOI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729740AbgAPQqJ (ORCPT ); Thu, 16 Jan 2020 11:46:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:55172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729393AbgAPQqE (ORCPT ); Thu, 16 Jan 2020 11:46:04 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 25B8D207FF; Thu, 16 Jan 2020 16:45:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193163; bh=UamV5Q8Q8gJKB4pMHysaybJwmbtlpHw38APEO/EgeAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0uzog9AxH+uvpMrUR+2aSBMDUykpkTOLQyStFBqJN3Or4SFVGiwzLiMvEgnx7qqmi WG9IBAceWHtMgWwpVs3gD6pjfuHw6r5IgxhgqgQcEksBHPASro78GUK3+ZjvkkzKat +maiafMlLQIcWI+bUogZiHELunqYVnWq0a7LCGtc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sakari Ailus , Heikki Krogerus , Andy Shevchenko , "Rafael J . Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL 5.4 037/205] software node: Get reference to parent swnode in get_parent op Date: Thu, 16 Jan 2020 11:40:12 -0500 Message-Id: <20200116164300.6705-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sakari Ailus [ Upstream commit 51c100a651a471fcb8ead1ecc1224471eb0d61b9 ] The software_node_get_parent() returned a pointer to the parent swnode, but did not take a reference to it, leading the caller to put a reference that was not taken. Take that reference now. Fixes: 59abd83672f7 ("drivers: base: Introducing software nodes to the firmware node framework") Signed-off-by: Sakari Ailus Reviewed-by: Heikki Krogerus Reviewed-by: Andy Shevchenko Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/base/swnode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index a1f3f0994f9f..d5b4905e2adb 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -520,7 +520,10 @@ software_node_get_parent(const struct fwnode_handle *fwnode) { struct swnode *swnode = to_swnode(fwnode); - return swnode ? (swnode->parent ? &swnode->parent->fwnode : NULL) : NULL; + if (!swnode || !swnode->parent) + return NULL; + + return fwnode_handle_get(&swnode->parent->fwnode); } static struct fwnode_handle * -- 2.20.1