From d05305fc79ed8246970e25f82687bbe588d3e085 Mon Sep 17 00:00:00 2001
From: Benjamin LaHaise <benjamin.c.lahaise@intel.com>
Date: Mon, 20 Mar 2006 21:31:51 -0800
Subject: [PATCH] --- yaml --- r: 22221 b: refs/heads/master c:
 1d541ddd74802cfa0eb8a3864668851f6cd79bdf h: refs/heads/master i:   22219:
 e0ff1136581fe7fd5db788e8298367171cf331ba v: v3

---
 [refs]                  |  2 +-
 trunk/include/net/scm.h | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f13b01ecb7f0..1e66ac9ac9dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9df7d7f584666533b1bdfcf5c60a43d64689198
+refs/heads/master: 1d541ddd74802cfa0eb8a3864668851f6cd79bdf
diff --git a/trunk/include/net/scm.h b/trunk/include/net/scm.h
index c3fa3d5ab606..540619cb7160 100644
--- a/trunk/include/net/scm.h
+++ b/trunk/include/net/scm.h
@@ -37,10 +37,12 @@ static __inline__ void scm_destroy(struct scm_cookie *scm)
 static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
 			       struct scm_cookie *scm)
 {
-	memset(scm, 0, sizeof(*scm));
-	scm->creds.uid = current->uid;
-	scm->creds.gid = current->gid;
-	scm->creds.pid = current->tgid;
+	struct task_struct *p = current;
+	scm->creds.uid = p->uid;
+	scm->creds.gid = p->gid;
+	scm->creds.pid = p->tgid;
+	scm->fp = NULL;
+	scm->seq = 0;
 	if (msg->msg_controllen <= 0)
 		return 0;
 	return __scm_send(sock, msg, scm);