[PATCH 7/7] bootm: use cdev_open_by_name()

Sascha Hauer s.hauer at pengutronix.de
Thu May 16 00:08:22 PDT 2024


cdev_by_name() returns a cdev without increasing its reference count. In
order to maintain a proper reference counting use cdev_open_by_name()
instead and make sure it's closed afterwards when no longer needed.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/bootm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/bootm.c b/common/bootm.c
index c851ab0456..357537c54e 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -760,7 +760,7 @@ int bootm_boot(struct bootm_data *bootm_data)
 
 		if (bootm_data->root_dev) {
 			const char *root_dev_name = devpath_to_name(bootm_data->root_dev);
-			const struct cdev *root_cdev = cdev_by_name(root_dev_name);
+			struct cdev *root_cdev = cdev_open_by_name(root_dev_name, O_RDONLY);
 
 			rootarg = cdev_get_linux_rootarg(root_cdev);
 			if (!rootarg) {
@@ -773,6 +773,9 @@ int bootm_boot(struct bootm_data *bootm_data)
 					pr_err("%s doesn't have a PARTUUID, cannot set root= option\n",
 						root_dev_name);
 			}
+
+			if (root_cdev)
+				cdev_close(root_cdev);
 		} else {
 			rootarg = path_get_linux_rootarg(data->os_file);
 		}
-- 
2.39.2




More information about the barebox mailing list