cpuset: fix cpuset_print_task_mems_allowed() vs rename() race

PATCH Applied Li Zefan 2 participants 2 messages Jan 25, 2013 cgroup

Share & tools

Li Zefan

author

2013-01-25 08:08 UTC #0 lore raw

PATCH v2 1/1 cpuset: fix cpuset_print_task_mems_allowed() vs rename() race

rename() will change dentry->d_name. The result of this race can be worse than seeing partially rewritten name, but we might access a stale pointer because rename() will re-allocate memory to hold a longer name.

It's safe in the protection of dentry->d_lock.

v2: check NULL dentry before acquiring dentry lock.

Signed-off-by Li Zefan <[email protected]>

---
 kernel/cpuset.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

kernel/cpuset.c +10 -2

index 16be7c9..4f9dfe4 100644
@@ -2606,8 +2606,16 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk)
 
 	dentry = task_cs(tsk)->css.cgroup->dentry;
 	spin_lock(&cpuset_buffer_lock);
-	snprintf(cpuset_name, CPUSET_NAME_LEN,
-		 dentry ? (const char *)dentry->d_name.name : "/");
+
+	if (!dentry) {
+		strcpy(cpuset_name, "/");
+	} else {
+		spin_lock(&dentry->d_lock);
+		strlcpy(cpuset_name, (const char *)dentry->d_name.name,
+			CPUSET_NAME_LEN);
+		spin_unlock(&dentry->d_lock);
+	}
+
 	nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN,
 			   tsk->mems_allowed);
 	printk(KERN_INFO "%s cpuset=%s mems_allowed=%s\n",

Signature · 1 line

1.8.0.2

Tejun Heo

maintainer Applied

2013-01-25 16:51 UTC #1 lore raw

Quoted 10 lines · Li Zefan

rename() will change dentry->d_name. The result of this race can be worse than seeing partially rewritten name, but we might access a stale pointer because rename() will re-allocate memory to hold a longer name.
It's safe in the protection of dentry->d_lock.
v2: check NULL dentry before acquiring dentry lock.
Signed-off-by Li Zefan <[email protected]>

Applied to cgroup/for-3.8-fixes w/ stable cc'd.

Thanks.

Signature · 1 line

tejun