|
@@ -541,7 +541,10 @@ static int sockfs_setattr(struct dentry *dentry, struct iattr *iattr)
|
|
|
if (!err && (iattr->ia_valid & ATTR_UID)) {
|
|
|
struct socket *sock = SOCKET_I(d_inode(dentry));
|
|
|
|
|
|
- sock->sk->sk_uid = iattr->ia_uid;
|
|
|
+ if (sock->sk)
|
|
|
+ sock->sk->sk_uid = iattr->ia_uid;
|
|
|
+ else
|
|
|
+ err = -ENOENT;
|
|
|
}
|
|
|
|
|
|
return err;
|
|
@@ -590,12 +593,16 @@ EXPORT_SYMBOL(sock_alloc);
|
|
|
* an inode not a file.
|
|
|
*/
|
|
|
|
|
|
-void sock_release(struct socket *sock)
|
|
|
+static void __sock_release(struct socket *sock, struct inode *inode)
|
|
|
{
|
|
|
if (sock->ops) {
|
|
|
struct module *owner = sock->ops->owner;
|
|
|
|
|
|
+ if (inode)
|
|
|
+ inode_lock(inode);
|
|
|
sock->ops->release(sock);
|
|
|
+ if (inode)
|
|
|
+ inode_unlock(inode);
|
|
|
sock->ops = NULL;
|
|
|
module_put(owner);
|
|
|
}
|
|
@@ -609,6 +616,11 @@ void sock_release(struct socket *sock)
|
|
|
}
|
|
|
sock->file = NULL;
|
|
|
}
|
|
|
+
|
|
|
+void sock_release(struct socket *sock)
|
|
|
+{
|
|
|
+ __sock_release(sock, NULL);
|
|
|
+}
|
|
|
EXPORT_SYMBOL(sock_release);
|
|
|
|
|
|
void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags)
|
|
@@ -1171,7 +1183,7 @@ static int sock_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
|
|
static int sock_close(struct inode *inode, struct file *filp)
|
|
|
{
|
|
|
- sock_release(SOCKET_I(inode));
|
|
|
+ __sock_release(SOCKET_I(inode), inode);
|
|
|
return 0;
|
|
|
}
|
|
|
|