Commit 607aad1e authored by Christian A. Ehrhardt's avatar Christian A. Ehrhardt Committed by Rob Herring
Browse files

of: unittest: Fix compile in the non-dynamic case 



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: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202401291740.VP219WIz-lkp@intel.com/


Fixes: 4dde8356 ("of: Fix double free in of_parse_phandle_with_args_map")
Signed-off-by: default avatarChristian A. Ehrhardt <lk@c--e.de>
Link: https://lore.kernel.org/r/20240129192556.403271-1-lk@c--e.de


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 8f7e9179

drivers/of/unittest.c

+9 −3
Original line number Diff line number Diff line
@@ -50,6 +50,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
@@ -570,7 +576,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");
@@ -693,9 +699,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]);

	}

}