From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBDAC4D5B7; Wed, 21 Feb 2024 13:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523130; cv=none; b=njyj+l9ScWoEHEMCkmcLGcdNeFFGDLG47OO7DIdttUGNPk5PJuxRt+WldVdhovDsgCn+RLH25YM1xkSaYozKXFzYvDCMRCVZe9CViXJFVODIILwX2QAH03IeinhMgTz4uOHZ5Tbp33VYv+n28BlrvyorrjF2BGmHZj5R+xwRD2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523130; c=relaxed/simple; bh=F2G7T2J4jiaa3056xinUA+kERB4U86O9JzQJotv7vdc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UM8WkDncxuLXGA1yRvYjkZ0dLIIp24OIDaZ5mPiBO7KNPbM4SDPLXgBfzV7XKDsN+qRSjgp6xt23d8K+Z1N8dvVHIReUdXx2xDTKI67F8WSJ1B8BXkmn3Z0YHWc+YF0Zw25MxSCKecyEPnCvH7kSCajtkMdthH0iIRSkJmHgfMM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VqEn5T79; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VqEn5T79" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C738C433C7; Wed, 21 Feb 2024 13:45:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708523129; bh=F2G7T2J4jiaa3056xinUA+kERB4U86O9JzQJotv7vdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VqEn5T79z/2Nadd0PgHAKWa4uM3MTFRov42NNz0CYACMaCrmTAWKC3v/U8HXdl4Pn JQOEVM9p6H0ApoIpUfchJm/R+oskV5p49zp9oqJrnLWqJLbqXZeqvh79IUBKMVeyHV 0QFiVZPjmkpju3LIwkEW0qostNRMFhIceP6HCbkE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , "Christian A. Ehrhardt" , Rob Herring , Sasha Levin Subject: [PATCH 5.15 348/476] of: unittest: Fix compile in the non-dynamic case Date: Wed, 21 Feb 2024 14:06:39 +0100 Message-ID: <20240221130020.850474709@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian A. Ehrhardt [ Upstream commit 607aad1e4356c210dbef9022955a3089377909b2 ] If CONFIG_OF_KOBJ is not set, a device_node does not contain a kobj and attempts to access the embedded kobj via kref_read break the compile. Replace affected kref_read calls with a macro that reads the refcount if it exists and returns 1 if there is no embedded kobj. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202401291740.VP219WIz-lkp@intel.com/ Fixes: 4dde83569832 ("of: Fix double free in of_parse_phandle_with_args_map") Signed-off-by: Christian A. Ehrhardt Link: https://lore.kernel.org/r/20240129192556.403271-1-lk@c--e.de Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/of/unittest.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 699daf0645d1..5a8d37cef0ba 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -49,6 +49,12 @@ static struct unittest_results { failed; \ }) +#ifdef CONFIG_OF_KOBJ +#define OF_KREF_READ(NODE) kref_read(&(NODE)->kobj.kref) +#else +#define OF_KREF_READ(NODE) 1 +#endif + /* * Expected message may have a message level other than KERN_INFO. * Print the expected message only if the current loglevel will allow @@ -562,7 +568,7 @@ static void __init of_unittest_parse_phandle_with_args_map(void) pr_err("missing testcase data\n"); return; } - prefs[i] = kref_read(&p[i]->kobj.kref); + prefs[i] = OF_KREF_READ(p[i]); } rc = of_count_phandle_with_args(np, "phandle-list", "#phandle-cells"); @@ -685,9 +691,9 @@ static void __init of_unittest_parse_phandle_with_args_map(void) unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc); for (i = 0; i < ARRAY_SIZE(p); ++i) { - unittest(prefs[i] == kref_read(&p[i]->kobj.kref), + unittest(prefs[i] == OF_KREF_READ(p[i]), "provider%d: expected:%d got:%d\n", - i, prefs[i], kref_read(&p[i]->kobj.kref)); + i, prefs[i], OF_KREF_READ(p[i])); of_node_put(p[i]); } } -- 2.43.0