---

yaml --- r: 184595 b: refs/heads/master c: 76dadd7 h: refs/heads/master i: 184593: 69b01a9 184591: 5b97cb1 v: v3
git-mirror · Mar 1, 2010 · 7cc1b7e · 7cc1b7e
1 parent 48197b8
commit 7cc1b7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;