[kernel] r19346 - dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz

[Ben Hutchings]

Author: benh
Date: Mon Aug 20 02:39:57 2012
New Revision: 19346

Log:
Adjust patch context

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Aug 20 02:32:00 2012	(r19345)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Aug 20 02:39:57 2012	(r19346)
@@ -6538,6 +6538,9 @@
 [bwh: Fix context for changes to flush_old_exec() and nf_ct_frag6_gather()
  after 2.6.32.42]
 [bwh: Fix context for changes to uptime_proc_show() after 2.6.32.55]
+[bwh: Fix context for changes to sock_alloc_send_psbk() after commit
+ cc9b17ad29ecaa20bfe426a8d4dbfb94b13ff1cc ('net: sock: validate data_len
+ before allocating skb in sock_alloc_send_pskb()')]
 
 diff --git a/COPYING.Parallels b/COPYING.Parallels
 new file mode 100644
@@ -83174,21 +83177,19 @@
  				     int *errcode)
  {
  	struct sk_buff *skb;
-@@ -1406,46 +1418,35 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+@@ -1406,44 +1418,35 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
  		if (sk->sk_shutdown & SEND_SHUTDOWN)
  			goto failure;
  
 -		if (atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf) {
 -			skb = alloc_skb(header_len, gfp_mask);
 -			if (skb) {
--				int npages;
 -				int i;
 -
 -				/* No pages, we're done... */
 -				if (!data_len)
 -					break;
 -
--				npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
 -				skb->truesize += data_len;
 -				skb_shinfo(skb)->nr_frags = npages;
 -				for (i = 0; i < npages; i++) {
@@ -91657,7 +91658,7 @@
  {
  	struct scm_cookie scm;
  	memset(&scm, 0, sizeof(scm));
-@@ -1322,6 +1332,7 @@ static void unix_destruct_fds(struct sk_buff *skb)
+@@ -1322,5 +1332,6 @@ static void unix_destruct_fds(struct sk_buff *skb)
  	scm_destroy(&scm);
  	sock_wfree(skb);
  }