diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
| commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
| tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /net/unix/garbage.c | |
| parent | 883ae7992c09435927dda642b61f1455fceb5b85 (diff) | |
| parent | bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 (diff) | |
| download | kernel_samsung_smdk4412-72ed73c3f0801e860ee27e53ab6aaf47941ba324.zip kernel_samsung_smdk4412-72ed73c3f0801e860ee27e53ab6aaf47941ba324.tar.gz kernel_samsung_smdk4412-72ed73c3f0801e860ee27e53ab6aaf47941ba324.tar.bz2 | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index f89f83b..b6f4b99 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -104,7 +104,7 @@ struct sock *unix_get_socket(struct file *filp) /* * Socket ? */ - if (S_ISSOCK(inode->i_mode)) { + if (S_ISSOCK(inode->i_mode) && !(filp->f_mode & FMODE_PATH)) { struct socket *sock = SOCKET_I(inode); struct sock *s = sock->sk; |