Merge: drivers: core: synchronize really_probe() and dev_uevent()

swvrrh · swvrrh · commit f18f10a02e12 · 2024-08-02T10:38:25.000-04:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4731 JIRA: https://issues.redhat.com/browse/RHEL-47652 CVE: CVE-2024-39501 Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: Desnes Nunes <desnesn@redhat.com> Approved-by: Marcelo Ricardo Leitner <mleitner@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
diff --git a/drivers/base/core.c b/drivers/base/core.c
@@ -2657,8 +2657,11 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,
 	if (!env)
 		return -ENOMEM;
 
+	/* Synchronize with really_probe() */
+	device_lock(dev);
 	/* let the kset specific function add its keys */
 	retval = kset->uevent_ops->uevent(&dev->kobj, env);
+	device_unlock(dev);
 	if (retval)
 		goto out;
 
diff --git a/tools/testing/selftests/net/forwarding/devlink_lib.sh b/tools/testing/selftests/net/forwarding/devlink_lib.sh
@@ -122,6 +122,8 @@ devlink_reload()
 	still_pending=$(devlink resource show "$DEVLINK_DEV" | \
 			grep -c "size_new")
 	check_err $still_pending "Failed reload - There are still unset sizes"
+
+	udevadm settle
 }
 
 declare -A DEVLINK_ORIG

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ devlink_reload()`
`122`	`122`	`still_pending=$(devlink resource show "$DEVLINK_DEV" \| \`
`123`	`123`	`grep -c "size_new")`
`124`	`124`	`check_err $still_pending "Failed reload - There are still unset sizes"`
	`125`	`+`
	`126`	`+ udevadm settle`
`125`	`127`	`}`
`126`	`128`
`127`	`129`	`declare -A DEVLINK_ORIG`