]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Update sendmsg-stackoverflow patch with sparc64 build fix from DaveM,
authorChris Wright <chrisw@osdl.org>
Fri, 9 Sep 2005 06:11:47 +0000 (23:11 -0700)
committerChris Wright <chrisw@osdl.org>
Fri, 9 Sep 2005 06:11:47 +0000 (23:11 -0700)
and add signed-off-by from David Woodhouse and Al Viro.

review/sendmsg-stackoverflow.patch

index e0826eb16c1e1545e719e732b9da503cf98694db..2dd0a1dc30f0a7673510be96e0625b3439e99280 100644 (file)
@@ -16,25 +16,30 @@ Another thing is that we use kmalloc() to allocate and sock_kfree_s()
 to free afterwards; less serious, but also needs fixing.
 
 Patch by Al Viro, David Miller, David Woodhouse
+(sparc64 clean compile fix from David Miller)
 
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
 ---
- include/net/compat.h |    2 +-
+ include/net/compat.h |    5 +++--
  net/compat.c         |   44 ++++++++++++++++++++++++++------------------
  net/socket.c         |    3 ++-
- 3 files changed, 29 insertions(+), 20 deletions(-)
+ 3 files changed, 31 insertions(+), 21 deletions(-)
 
 Index: linux-2.6.13.y/include/net/compat.h
 ===================================================================
 --- linux-2.6.13.y.orig/include/net/compat.h
 +++ linux-2.6.13.y/include/net/compat.h
-@@ -33,7 +33,7 @@ extern asmlinkage long compat_sys_sendms
+@@ -33,7 +33,8 @@ extern asmlinkage long compat_sys_sendms
  extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
  extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
  extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
 -extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, unsigned char *,
-+extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *,
-               int);
+-              int);
++
++struct sock;
++extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);
  
  #endif /* NET_COMPAT_H */
 Index: linux-2.6.13.y/net/compat.c