Skip to contentSkip to conversation

drivers: core: Remove glue dirs early only when refcount is 1

PATCH Superseded Prateek Sood 2 participants 7 messages Apr 30, 2019 – May 24, 2019 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: core: Remove glue dirs early only when refcount is 1

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

CPU1 CPU2
_request_firmware_load()
device_add()
get_device_parent()
class_dir_create_and_add()
kobject_add_internal()
create_dir() // glue_dir

_request_firmware_load()
device_add()
get_device_parent()
kobject_get() //glue_dir

device_del()

    cleanup_glue_dir()
      kobject_del()

                                               kobject_add()
                                                 kobject_add_internal()
                                                   create_dir() // in glue_dir
                                                     kernfs_create_dir_ns()

       sysfs_remove_dir() //glue_dir->sd=NULL
       sysfs_put() // free glue_dir->sd

                                                       kernfs_new_node()
                                                         kernfs_get(glue_dir)

Fix this race by making sure that kernfs_node for glue_dir is released only when refcount for glue_dir kobj is 1.

---
 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/core.c +4 -1
index 4aeaa0c..3955d07 100644
@@ -1820,12 +1820,15 @@ static inline struct kobject *get_glue_dir(struct device *dev)
  */
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
+	unsigned int refcount;
+
 	/* see if we live in a "glue" directory */
 	if (!live_in_glue_dir(glue_dir, dev))
 		return;
 
 	mutex_lock(&gdp_mutex);
-	if (!kobject_has_children(glue_dir))
+	refcount = kref_read(&glue_dir->kref);
+	if (!kobject_has_children(glue_dir) && !--refcount)
 		kobject_del(glue_dir);
 	kobject_put(glue_dir);
 	mutex_unlock(&gdp_mutex);
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., 
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#1 lore raw

PATCH v2 1/1 drivers: core: Remove glue dirs early only when refcount is 1

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

CPU1 CPU2
fw_load_sysfs_fallback()
device_add()
get_device_parent()
class_dir_create_and_add()
kobject_add_internal()
create_dir() // glue_dir

fw_load_sysfs_fallback()
device_add()
get_device_parent()
kobject_get() //glue_dir

device_del()

    cleanup_glue_dir()
      kobject_del()

                                               kobject_add()
                                                 kobject_add_internal()
                                                   create_dir() // in glue_dir
                                                     kernfs_create_dir_ns()

       sysfs_remove_dir() //glue_dir->sd=NULL
       sysfs_put() // free glue_dir->sd

                                                       kernfs_new_node()
                                                         kernfs_get(glue_dir)

Fix this race by making sure that kernfs_node for glue_dir is released only when refcount for glue_dir kobj is 1.

---
 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/core.c +4 -1
index 4aeaa0c..3955d07 100644
@@ -1820,12 +1820,15 @@ static inline struct kobject *get_glue_dir(struct device *dev)
  */
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
+	unsigned int refcount;
+
 	/* see if we live in a "glue" directory */
 	if (!live_in_glue_dir(glue_dir, dev))
 		return;
 
 	mutex_lock(&gdp_mutex);
-	if (!kobject_has_children(glue_dir))
+	refcount = kref_read(&glue_dir->kref);
+	if (!kobject_has_children(glue_dir) && !--refcount)
 		kobject_del(glue_dir);
 	kobject_put(glue_dir);
 	mutex_unlock(&gdp_mutex);
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., 
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
maintainer
#2 lore raw
Quoted 32 lines · Prateek Sood

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

CPU1 CPU2
fw_load_sysfs_fallback()
device_add()
get_device_parent()
class_dir_create_and_add()
kobject_add_internal()
create_dir() // glue_dir

fw_load_sysfs_fallback()
device_add()
get_device_parent()
kobject_get() //glue_dir

device_del()

    cleanup_glue_dir()
      kobject_del()

                                               kobject_add()
                                                 kobject_add_internal()
                                                   create_dir() // in glue_dir
                                                     kernfs_create_dir_ns()

       sysfs_remove_dir() //glue_dir->sd=NULL
       sysfs_put() // free glue_dir->sd

                                                       kernfs_new_node()
                                                         kernfs_get(glue_dir)
Quoted 7 lines

Fix this race by making sure that kernfs_node for glue_dir is released only when refcount for glue_dir kobj is 1.

---
 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

What changed from v1? That always has to go below the --- line.

v3 please.

#3 lore raw

PATCH v3 1/1 drivers: core: Remove glue dirs early only when refcount is 1

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

CPU1 CPU2
fw_load_sysfs_fallback()
device_add()
get_device_parent()
class_dir_create_and_add()
kobject_add_internal()
create_dir() // glue_dir

fw_load_sysfs_fallback()
device_add()
get_device_parent()
kobject_get() //glue_dir

device_del()

    cleanup_glue_dir()
      kobject_del()

                                               kobject_add()
                                                 kobject_add_internal()
                                                   create_dir() // in glue_dir
                                                     kernfs_create_dir_ns()

       sysfs_remove_dir() //glue_dir->sd=NULL
       sysfs_put() // free glue_dir->sd

                                                       kernfs_new_node()
                                                         kernfs_get(glue_dir)

Fix this race by making sure that kernfs_node for glue_dir is released only when refcount for glue_dir kobj is 1.

---

Changes from v2->v3:
- Added patch version change related comments.

Changes from v1->v2:
- Updated callstack from _request_firmware_load() to fw_load_sysfs_fallback().

 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/core.c +4 -1
index 4aeaa0c..3955d07 100644
@@ -1820,12 +1820,15 @@ static inline struct kobject *get_glue_dir(struct device *dev)
  */
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
+	unsigned int refcount;
+
 	/* see if we live in a "glue" directory */
 	if (!live_in_glue_dir(glue_dir, dev))
 		return;
 
 	mutex_lock(&gdp_mutex);
-	if (!kobject_has_children(glue_dir))
+	refcount = kref_read(&glue_dir->kref);
+	if (!kobject_has_children(glue_dir) && !--refcount)
 		kobject_del(glue_dir);
 	kobject_put(glue_dir);
 	mutex_unlock(&gdp_mutex);
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., 
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#4 lore raw
Quoted 61 lines · Prateek Sood

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

CPU1 CPU2
fw_load_sysfs_fallback()
device_add()
get_device_parent()
class_dir_create_and_add()
kobject_add_internal()
create_dir() // glue_dir

fw_load_sysfs_fallback()
device_add()
get_device_parent()
kobject_get() //glue_dir

device_del()

    cleanup_glue_dir()
      kobject_del()

                                               kobject_add()
                                                 kobject_add_internal()
                                                   create_dir() // in glue_dir
                                                     kernfs_create_dir_ns()

       sysfs_remove_dir() //glue_dir->sd=NULL
       sysfs_put() // free glue_dir->sd

                                                       kernfs_new_node()
                                                         kernfs_get(glue_dir)

Fix this race by making sure that kernfs_node for glue_dir is released only when refcount for glue_dir kobj is 1.

---

Changes from v2->v3:
- Added patch version change related comments.

Changes from v1->v2:
- Updated callstack from _request_firmware_load() to fw_load_sysfs_fallback().

 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/core.c +2 -0
index 4aeaa0c..3955d07 100644
@@ -1820,12 +1820,15 @@ static inline struct kobject *get_glue_dir(struct device *dev)
  */
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
+	unsigned int refcount;
+
 	/* see if we live in a "glue" directory */

drivers/base/core.c static inline struct kobject *get_glue_dir(struct device *dev) · line 1834

Quoted 10 lines
drivers/base/core.c +2 -1
 	if (!live_in_glue_dir(glue_dir, dev))
 		return;
 
 	mutex_lock(&gdp_mutex);
-	if (!kobject_has_children(glue_dir))
+	refcount = kref_read(&glue_dir->kref);
+	if (!kobject_has_children(glue_dir) && !--refcount)
 		kobject_del(glue_dir);
 	kobject_put(glue_dir);
 	mutex_unlock(&gdp_mutex);

Folks,

Please share feedback on the race condition and the patch to fix it.

Signature · 3 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation
Center, Inc., is a member of Code Aurora Forum, a Linux Foundation
Collaborative Project
maintainer
#5 lore raw
Quoted 75 lines · Prateek Sood
Quoted 61 lines · Prateek Sood

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

CPU1 CPU2
fw_load_sysfs_fallback()
device_add()
get_device_parent()
class_dir_create_and_add()
kobject_add_internal()
create_dir() // glue_dir

fw_load_sysfs_fallback()
device_add()
get_device_parent()
kobject_get() //glue_dir

device_del()

    cleanup_glue_dir()
      kobject_del()

                                               kobject_add()
                                                 kobject_add_internal()
                                                   create_dir() // in glue_dir
                                                     kernfs_create_dir_ns()

       sysfs_remove_dir() //glue_dir->sd=NULL
       sysfs_put() // free glue_dir->sd

                                                       kernfs_new_node()
                                                         kernfs_get(glue_dir)

Fix this race by making sure that kernfs_node for glue_dir is released only when refcount for glue_dir kobj is 1.

---

Changes from v2->v3:
- Added patch version change related comments.

Changes from v1->v2:
- Updated callstack from _request_firmware_load() to fw_load_sysfs_fallback().

 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/core.c +2 -0
index 4aeaa0c..3955d07 100644
@@ -1820,12 +1820,15 @@ static inline struct kobject *get_glue_dir(struct device *dev)
  */
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
+	unsigned int refcount;
+
 	/* see if we live in a "glue" directory */

drivers/base/core.c static inline struct kobject *get_glue_dir(struct device *dev) · line 1834

Quoted 10 lines
drivers/base/core.c +2 -1
 	if (!live_in_glue_dir(glue_dir, dev))
 		return;
 
 	mutex_lock(&gdp_mutex);
-	if (!kobject_has_children(glue_dir))
+	refcount = kref_read(&glue_dir->kref);
+	if (!kobject_has_children(glue_dir) && !--refcount)
 		kobject_del(glue_dir);
 	kobject_put(glue_dir);
 	mutex_unlock(&gdp_mutex);

Folks,

Quoted 2 lines

Please share feedback on the race condition and the patch to fix it.

Please relax, we will get to this eventually, it has only been a week...

greg k-h

maintainer
#6 lore raw
In reply to Prateek Sood
Quoted 3 lines · Prateek Sood

While loading firmware blobs parallely in different threads, it is possible to free sysfs node of glue_dirs in device_del() from a thread while another thread is trying to add subdir from device_add() in glue_dirs sysfs node.

<snip>

Is this the same fix that:
Subject: [PATCH v4] driver core: Fix use-after-free and double free on glue directory
is also trying to fix?

Why is it doing so in such a different way?

thanks,

greg k-h