[PATCH v3 3/6] cgroup: Update classid for fd pass in SCM_RIGHTS datagramm
From: Daniel Wagner <hidden>
Date: 2012-08-14 13:02:20
Also in:
netdev
Subsystem:
networking [general], networking [sockets], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Willem de Bruijn, Linus Torvalds
From: Daniel Wagner <redacted> A socket fd passed in a SCM_RIGHTS datagram was not getting updated with the new tasks cgrp classid. This leaves IO on the socket tagged with the old tasks classid. To fix this add a check in the scm recvmsg path to update the sock cgrp classid with the new tasks value. Signed-off-by: Daniel Wagner <redacted> Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> Cc: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org> Cc: David Howells <redacted> Cc: Eric Dumazet <redacted> Cc: John Fastabend <redacted> Cc: Neil Horman <redacted> Cc: Tim Chen <tim.c.chen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- net/core/scm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net/core/scm.c b/net/core/scm.c
index 8f6ccfd..221080f 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c@@ -35,7 +35,7 @@ #include <net/sock.h> #include <net/compat.h> #include <net/scm.h> - +#include <net/cls_cgroup.h> /* * Only allow a user to send credentials, that they could set with
@@ -249,6 +249,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) struct file **fp = scm->fp->fp; int __user *cmfptr; int err = 0, i; + __u32 classid = task_cls_classid(current); if (MSG_CMSG_COMPAT & msg->msg_flags) { scm_detach_fds_compat(msg, scm);
@@ -265,6 +266,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)
@@ -282,6 +284,9 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) /* Bump the usage count and install the file. */ get_file(fp[i]); fd_install(new_fd, fp[i]); + sock = sock_from_file(fp[i], &err); + if (sock) + sock->sk->sk_classid = classid; } if (i > 0)
--
1.7.12.rc1.16.g05a20c8