---

yaml --- r: 22221 b: refs/heads/master c: 1d541dd h: refs/heads/master i: 22219: e0ff113 v: v3
git-mirror · Mar 21, 2006 · d05305f · d05305f
1 parent 0d42177
commit d05305f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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);