Driver-Core: devtmpfs - prevent concurrent subdirectory creation and removal
From: Kay Sievers <[email protected]>
Subject: Driver-Core: devtmpfs - prevent concurrent subdirectory creation and removal
--- drivers/base/devtmpfs.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/base/devtmpfs.c +16 -10
@@ -32,6 +32,8 @@ static int dev_mount = 1;static int dev_mount;#endif +static rwlock_t dirlock; +static int __init mount_param (char *str) { dev_mount =simple_strtoul (str,NULL ,0 );
@@ -86,16 +88,12 @@ static int dev_mkdir(const char *name, mstatic int create_path (const char *nodepath) { -char *path;struct nameidata nd;int err =0 ; - path =kstrdup (nodepath,GFP_KERNEL ); -if (!path) -return -ENOMEM ; - +read_lock (&dirlock); err =vfs_path_lookup (dev_mnt->mnt_root, dev_mnt, - path,LOOKUP_PARENT , &nd); + nodepath,LOOKUP_PARENT , &nd);if (err ==0 ) {struct dentry *dentry;
@@ -107,14 +105,17 @@ static int create_path(const char *nodepdput (dentry); }mutex_unlock (&nd.path.dentry->d_inode->i_mutex); -path_put (&nd.path); }else if (err == -ENOENT ) { +char *path;char *s;/* parent directories do not exist, create them */ + path =kstrdup (nodepath,GFP_KERNEL ); +if (!path) +return -ENOMEM ; s = path; -while (1 ) { +for (;;) { s =strchr (s,'/' );if (!s)break ;
@@ -125,9 +126,10 @@ static int create_path(const char *nodep s[0 ] ='/' ; s++; } +kfree (path); } +read_unlock (&dirlock); -kfree (path);return err; }
@@ -232,7 +234,8 @@ static int delete_path(const char *nodepif (!path)return -ENOMEM ; -while (1 ) { +write_lock (&dirlock); +for (;;) {char *base; base =strrchr (path,'/' );
@@ -243,6 +246,7 @@ static int delete_path(const char *nodepif (err)break ; } +write_unlock (&dirlock);kfree (path);return err;
@@ -358,6 +362,8 @@ int __init devtmpfs_init(void)int err;struct vfsmount *mnt; +rwlock_init (&dirlock); + err =register_filesystem (&dev_fs_type);if (err) { printk(KERN_ERR "devtmpfs: unable to register devtmpfs "
[email protected]
Appliedpatch driver-core-devtmpfs-prevent-concurrent-subdirectory-creation-and-removal.patch added to gregkh-2.6 tree
This is a note to let you know that I've just added the patch titled
Subject: Driver core: devtmpfs: prevent concurrent subdirectory creation and removal
to my gregkh-2.6 tree. Its filename is
driver-core-devtmpfs-prevent-concurrent-subdirectory-creation-and-removal.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Thu Oct 29 11:59:28 2009
From: Kay Sievers <[email protected]>
Date: Wed, 28 Oct 2009 19:51:06 +0100
Subject: Driver core: devtmpfs: prevent concurrent subdirectory creation and removal
To: Greg KH <[email protected]>
Cc: linux-kernel <[email protected]>
Message-ID: <[email protected]>
From: Kay Sievers <[email protected]>
--- drivers/base/devtmpfs.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/base/devtmpfs.c +16 -10
@@ -32,6 +32,8 @@ static int dev_mount = 1;static int dev_mount;#endif +static rwlock_t dirlock; +static int __init mount_param (char *str) { dev_mount =simple_strtoul (str,NULL ,0 );
@@ -86,16 +88,12 @@ static int dev_mkdir(const char *name, mstatic int create_path (const char *nodepath) { -char *path;struct nameidata nd;int err =0 ; - path =kstrdup (nodepath,GFP_KERNEL ); -if (!path) -return -ENOMEM ; - +read_lock (&dirlock); err =vfs_path_lookup (dev_mnt->mnt_root, dev_mnt, - path,LOOKUP_PARENT , &nd); + nodepath,LOOKUP_PARENT , &nd);if (err ==0 ) {struct dentry *dentry;
@@ -107,14 +105,17 @@ static int create_path(const char *nodepdput (dentry); }mutex_unlock (&nd.path.dentry->d_inode->i_mutex); -path_put (&nd.path); }else if (err == -ENOENT ) { +char *path;char *s;/* parent directories do not exist, create them */ + path =kstrdup (nodepath,GFP_KERNEL ); +if (!path) +return -ENOMEM ; s = path; -while (1 ) { +for (;;) { s =strchr (s,'/' );if (!s)break ;
@@ -125,9 +126,10 @@ static int create_path(const char *nodep s[0 ] ='/' ; s++; } +kfree (path); } +read_unlock (&dirlock); -kfree (path);return err; }
@@ -232,7 +234,8 @@ static int delete_path(const char *nodepif (!path)return -ENOMEM ; -while (1 ) { +write_lock (&dirlock); +for (;;) {char *base; base =strrchr (path,'/' );
@@ -243,6 +246,7 @@ static int delete_path(const char *nodepif (err)break ; } +write_unlock (&dirlock);kfree (path);return err;
@@ -358,6 +362,8 @@ int __init devtmpfs_init(void)int err;struct vfsmount *mnt; +rwlock_init (&dirlock); + err =register_filesystem (&dev_fs_type);if (err) { printk(KERN_ERR "devtmpfs: unable to register devtmpfs "