[PATCH 18/28] unix_find_other() elevate write count for touch_atime()

Dave Hansen
2006-08-01T23:55:09Z

lxc-dave/net/unix/af_unix.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)

diff -puN net/unix/af_unix.c~C-elevate-writers-opens-part4 net/unix/af_unix.c
--- lxc/net/unix/af_unix.c~C-elevate-writers-opens-part4 2006-08-01 16:35:09.000000000 -0700
+++ lxc-dave/net/unix/af_unix.c 2006-08-01 16:35:27.000000000 -0700
@@ -708,21 +708,27 @@ static struct sock *unix_find_other(stru
err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd);
if (err)
goto fail;
+
+ err = mnt_want_write(nd.mnt);
+ if (err)
+ goto put_path_fail;
+
err = vfs_permission(&nd, MAY_WRITE);
if (err)
- goto put_fail;
+ goto mnt_drop_write_fail;

err = -ECONNREFUSED;
if (!S_ISSOCK(nd.dentry->d_inode->i_mode))
- goto put_fail;
+ goto mnt_drop_write_fail;
u=unix_find_socket_byinode(nd.dentry->d_inode);
if (!u)
- goto put_fail;
+ goto mnt_drop_write_fail;

if (u->sk_type == type)
touch_atime(nd.mnt, nd.dentry);

path_release(&nd);
+ mnt_drop_write(nd.mnt);

err=-EPROTOTYPE;
if (u->sk_type != type) {
@@ -742,7 +748,9 @@ static struct sock *unix_find_other(stru
}
return u;

-put_fail:
+mnt_drop_write_fail:
+ mnt_drop_write(nd.mnt);
+put_path_fail:
path_release(&nd);
fail:
*error=err;
_