fs: fix overflow in sys_mount() for in-kernel calls

[safe/jmp/linux-2.6] / include / net / scm.h

diff --git a/include/net/scm.h b/include/net/scm.h
index f160116..cf48c80 100644 (file)
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -14,8 +14,9 @@
 
 struct scm_fp_list
 {
-       int             count;
-       struct file     *fp[SCM_MAX_FD];
+       struct list_head        list;
+       int                     count;
+       struct file             *fp[SCM_MAX_FD];
 };
 
 struct scm_cookie
@@ -25,7 +26,6 @@ struct scm_cookie
 #ifdef CONFIG_SECURITY_NETWORK
        u32                     secid;          /* Passed security ID   */
 #endif
-       unsigned long           seq;            /* Connection seqno     */
 };
 
 extern void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm);
@@ -58,7 +58,6 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
        scm->creds.gid = current_gid();
        scm->creds.pid = task_tgid_vnr(p);
        scm->fp = NULL;
-       scm->seq = 0;
        unix_get_peersec_dgram(sock, scm);
        if (msg->msg_controllen <= 0)
                return 0;