diff options
| author | John Fastabend <[email protected]> | 2012-08-14 12:34:30 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2012-08-16 21:56:11 +0000 |
| commit | 48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8 (patch) | |
| tree | d3b54c7b7748fecd44cdd7553c95f299cc6274f7 /net/core/scm.c | |
| parent | net: netprio: fix files lock and remove useless d_path bits (diff) | |
| download | kernel-48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8.tar.gz kernel-48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8.zip | |
net: netprio: fd passed in SCM_RIGHTS datagram not set correctly
A socket fd passed in a SCM_RIGHTS datagram was not getting
updated with the new tasks cgrp prioidx. This leaves IO on
the socket tagged with the old tasks priority.
To fix this add a check in the scm recvmsg path to update the
sock cgrp prioidx with the new tasks value.
Thanks to Al Viro for catching this.
CC: Neil Horman <[email protected]>
Reported-by: Al Viro <[email protected]>
Signed-off-by: John Fastabend <[email protected]>
Acked-by: Neil Horman <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/core/scm.c')
| -rw-r--r-- | net/core/scm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 8f6ccfd68ef4..040cebeed45b 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -265,6 +265,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax; i++, cmfptr++) { + struct socket *sock; int new_fd; err = security_file_receive(fp[i]); if (err) @@ -281,6 +282,9 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) } /* Bump the usage count and install the file. */ get_file(fp[i]); + sock = sock_from_file(fp[i], &err); + if (sock) + sock_update_netprioidx(sock->sk, current); fd_install(new_fd, fp[i]); } |