From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 27 Jan 2005 20:45:09 +0000 (+0000)
Subject: - merge revision 1.3
X-Git-Tag: planetlab-3_0-rc10~24
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e4ca391efa1291fb7e24c8d7a26b21d4455c53b9;p=linux-2.6.git

- merge revision 1.3
date: 2005/01/19 22:42:27;  author: mef;  state: Exp;  lines: +1 -3
Fixes CAN-2004 security reports 1016, 1017, and 1068
---

diff --git a/net/core/scm.c b/net/core/scm.c
index 3699df388..a2ebf30f6 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -127,9 +127,7 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
 		   for too short ancillary data object at all! Oops.
 		   OK, let's add it...
 		 */
-		if (cmsg->cmsg_len < sizeof(struct cmsghdr) ||
-		    (unsigned long)(((char*)cmsg - (char*)msg->msg_control)
-				    + cmsg->cmsg_len) > msg->msg_controllen)
+		if (!CMSG_OK(msg, cmsg))
 			goto error;
 
 		if (cmsg->cmsg_level != SOL_SOCKET)