diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
| commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
| tree | 975f56627b78f757608b31684311a24ca1478481 /net/unix | |
| parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
| parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 41feca3bef86..acc73ba8bade 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -676,7 +676,7 @@ static struct sock *unix_find_other(struct sockaddr_un *sunname, int len, | |||
| 676 | err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd); | 676 | err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd); |
| 677 | if (err) | 677 | if (err) |
| 678 | goto fail; | 678 | goto fail; |
| 679 | err = permission(nd.dentry->d_inode,MAY_WRITE, &nd); | 679 | err = vfs_permission(&nd, MAY_WRITE); |
| 680 | if (err) | 680 | if (err) |
| 681 | goto put_fail; | 681 | goto put_fail; |
| 682 | 682 | ||