diff --git a/[refs] b/[refs] index d5697393d013..f54e3eedb90c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39286fa41a8b2c6a9c1f656a7b3c3efca95bc1b9 +refs/heads/master: 76dadd76c265a0cdb5a76aa4eef03fcc9639b388 diff --git a/trunk/net/core/scm.c b/trunk/net/core/scm.c index b7ba91b074b3..9b264634acfd 100644 --- a/trunk/net/core/scm.c +++ b/trunk/net/core/scm.c @@ -156,6 +156,8 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p) 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;