| Date | Fri, 12 Mar 2010 16:27:10 -0800 | From | Greg KH <> | Subject | [097/145] scm: Only support SCM_RIGHTS on unix domain sockets. |
| |
2.6.32-stable review patch. If anyone has any objections, please let me know.
---------------- From: Eric W. Biederman <ebiederm@xmission.com>
commit 76dadd76c265a0cdb5a76aa4eef03fcc9639b388 upstream.
We use scm_send and scm_recv on both unix domain and netlink sockets, but only unix domain sockets support everything required for file descriptor passing, so error if someone attempts to pass file descriptors over netlink sockets.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- net/core/scm.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/net/core/scm.c +++ b/net/core/scm.c @@ -156,6 +156,8 @@ int __scm_send(struct socket *sock, stru switch (cmsg->cmsg_type) { case SCM_RIGHTS: + if (!sock->ops || sock->ops->family != PF_UNIX) + goto error; err=scm_fp_copy(cmsg, &p->fp); if (err<0) goto error;
|