[kernel] r19352 - in dists/squeeze-security/linux-2.6/debian/patches: features/all/openvz series

[Ben Hutchings]

Author: benh
Date: Tue Aug 21 12:28:31 2012
New Revision: 19352

Log:
Revert a conflicting and unnecessary fix for OpenVZ

Added:
   dists/squeeze-security/linux-2.6/debian/patches/series/45squeeze1-extra
      - copied, changed from r19350, dists/squeeze-security/linux-2.6/debian/patches/series/44-extra
Deleted:
   dists/squeeze-security/linux-2.6/debian/patches/series/44-extra
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	Tue Aug 21 04:49:15 2012	(r19351)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Tue Aug 21 12:28:31 2012	(r19352)
@@ -6538,9 +6538,6 @@
 [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()')]
 [bwh: Fix context for changes to lease_alloc() after commit
  79549c6dfda0603dba9a70a53467ce62d9335c33 ('cred: copy_process() should
  clear child->replacement_session_keyring')]
@@ -83180,19 +83177,21 @@
  				     int *errcode)
  {
  	struct sk_buff *skb;
-@@ -1406,44 +1418,35 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+@@ -1406,46 +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++) {

Copied and modified: dists/squeeze-security/linux-2.6/debian/patches/series/45squeeze1-extra (from r19350, dists/squeeze-security/linux-2.6/debian/patches/series/44-extra)
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/44-extra	Tue Aug 21 03:50:56 2012	(r19350, copy source)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/45squeeze1-extra	Tue Aug 21 12:28:31 2012	(r19352)
@@ -1,3 +1,6 @@
+# OpenVZ doesn't use sock_alloc_send_pskb().  It replaces it with
+# sock_alloc_send_skb2(), which doesn't seem to need this fix.
+- bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-sock_alloc_send_pskb.patch featureset=openvz
 - bugfix/all/sched-work-around-sched_group-cpu_power-0.patch featureset=openvz
 + debian/revert-sched-changes-in-2.6.32.29.patch featureset=openvz
 + debian/revert-cfq-changes-in-2.6.32.47.patch featureset=openvz