[kernel] r22766 - in dists/squeeze-security/linux-2.6/debian: . patches/bugfix/all patches/bugfix/all/stable patches/series

[Ben Hutchings]

Author: benh
Date: Wed Jun 17 12:46:42 2015
New Revision: 22766

Log:
Update to 2.6.32.67

Added:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.67.patch
Deleted:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tcp-fix-tcp_send_fin-regression-in-2.6.32.66.patch
Modified:
   dists/squeeze-security/linux-2.6/debian/changelog
   dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze13

Modified: dists/squeeze-security/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/changelog	Wed Jun 17 11:44:57 2015	(r22765)
+++ dists/squeeze-security/linux-2.6/debian/changelog	Wed Jun 17 12:46:42 2015	(r22766)
@@ -1,8 +1,11 @@
 linux-2.6 (2.6.32-48squeeze13) squeeze-lts; urgency=high
 
-  * tcp: Fix tcp_send_fin() regression in 2.6.32.66 (Closes: #789037)
+  * Add stable release 2.6.32.67:
+    - net: fix incorrect backport of tcp_send_fin in 2.6.32.66
+      (Closes: #789037)
+    - net: socket: Fix the wrong returns for recvmsg and sendmsg
 
- -- Ben Hutchings <ben at decadent.org.uk>  Wed, 17 Jun 2015 12:30:32 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 17 Jun 2015 13:44:28 +0100
 
 linux-2.6 (2.6.32-48squeeze12) squeeze-lts; urgency=high
 

Added: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.67.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.67.patch	Wed Jun 17 12:46:42 2015	(r22766)
@@ -0,0 +1,59 @@
+diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
+index 5339f06..d1e2895 100644
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -2136,7 +2136,7 @@ void tcp_send_fin(struct sock *sk)
+ 	 */
+ 	if (tskb && (tcp_send_head(sk) || tcp_memory_pressure)) {
+ coalesce:
+-		TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_FIN;
++		TCP_SKB_CB(tskb)->flags |= TCPCB_FLAG_FIN;
+ 		TCP_SKB_CB(tskb)->end_seq++;
+ 		tp->write_seq++;
+ 		if (!tcp_send_head(sk)) {
+diff --git a/net/socket.c b/net/socket.c
+index a838a67..806b365 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -1903,15 +1903,12 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned, flags)
+ 	int fput_needed;
+ 
+ 	err = -EFAULT;
+-	if (MSG_CMSG_COMPAT & flags) {
+-		if (get_compat_msghdr(&msg_sys, msg_compat))
+-			return -EFAULT;
+-	}
+-	else {
++	if (MSG_CMSG_COMPAT & flags)
++		err = get_compat_msghdr(&msg_sys, msg_compat);
++	else
+ 		err = copy_msghdr_from_user(&msg_sys, msg);
+-		if (err)
+-			return err;
+-	}
++	if (err)
++		return err;
+ 
+ 	sock = sockfd_lookup_light(fd, &err, &fput_needed);
+ 	if (!sock)
+@@ -2016,15 +2013,12 @@ SYSCALL_DEFINE3(recvmsg, int, fd, struct msghdr __user *, msg,
+ 	struct sockaddr __user *uaddr;
+ 	int __user *uaddr_len;
+ 
+-	if (MSG_CMSG_COMPAT & flags) {
+-		if (get_compat_msghdr(&msg_sys, msg_compat))
+-			return -EFAULT;
+-	}
+-	else {
++	if (MSG_CMSG_COMPAT & flags)
++		err = get_compat_msghdr(&msg_sys, msg_compat);
++	else
+ 		err = copy_msghdr_from_user(&msg_sys, msg);
+-		if (err)
+-			return err;
+-	}
++	if (err)
++		return err;
+ 
+ 	sock = sockfd_lookup_light(fd, &err, &fput_needed);
+ 	if (!sock)

Modified: dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze13
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze13	Wed Jun 17 11:44:57 2015	(r22765)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze13	Wed Jun 17 12:46:42 2015	(r22766)
@@ -1 +1 @@
-+ bugfix/all/tcp-fix-tcp_send_fin-regression-in-2.6.32.66.patch
++ bugfix/all/stable/2.6.32.67.patch