cgroup: net_cls: Pass in task to sock_update_classid()

[cascardo/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index d92c490..f1a481a 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -620,7 +620,7 @@ static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock,
 {
        struct sock_iocb *si = kiocb_to_siocb(iocb);
 
-       sock_update_classid(sock->sk);
+       sock_update_classid(sock->sk, current);
 
        si->sock = sock;
        si->scm = NULL;
@@ -784,7 +784,7 @@ static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock,
 {
        struct sock_iocb *si = kiocb_to_siocb(iocb);
 
-       sock_update_classid(sock->sk);
+       sock_update_classid(sock->sk, current);
 
        si->sock = sock;
        si->scm = NULL;
@@ -896,7 +896,7 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
        if (unlikely(!sock->ops->splice_read))
                return -EINVAL;
 
-       sock_update_classid(sock->sk);
+       sock_update_classid(sock->sk, current);
 
        return sock->ops->splice_read(sock, ppos, pipe, len, flags);
 }
@@ -3437,7 +3437,7 @@ EXPORT_SYMBOL(kernel_setsockopt);
 int kernel_sendpage(struct socket *sock, struct page *page, int offset,
                    size_t size, int flags)
 {
-       sock_update_classid(sock->sk);
+       sock_update_classid(sock->sk, current);
 
        if (sock->ops->sendpage)
                return sock->ops->sendpage(sock, page, offset, size, flags);