[kernel] r17905 - in dists/squeeze-security/linux-2.6/debian/patches: debian series

[Dann Frazier]

Author: dannf
Date: Thu Aug 11 06:04:25 2011
New Revision: 17905

Log:
avoid ABI change in NLM fix

Added:
   dists/squeeze-security/linux-2.6/debian/patches/debian/nlm-Avoid-ABI-change-from-dont-hang-forever-on-nlm-unlock-requests.patch
Modified:
   dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1

Added: dists/squeeze-security/linux-2.6/debian/patches/debian/nlm-Avoid-ABI-change-from-dont-hang-forever-on-nlm-unlock-requests.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/debian/nlm-Avoid-ABI-change-from-dont-hang-forever-on-nlm-unlock-requests.patch	Thu Aug 11 06:04:25 2011	(r17905)
@@ -0,0 +1,23 @@
+commit 613006cb46d1931bf7331fd3951efd7a0a0bb118
+Author: dann frazier <dannf at debian.org>
+Date:   Mon Aug 8 21:43:14 2011 -0600
+
+    Avoid ABI change in fix for CVE-2011-2491
+
+diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
+index 67f63dd..b5e54f3 100644
+--- a/include/linux/sunrpc/sched.h
++++ b/include/linux/sunrpc/sched.h
+@@ -84,8 +84,10 @@ struct rpc_task {
+ 	long			tk_rtt;		/* round-trip time (jiffies) */
+ 
+ 	pid_t			tk_owner;	/* Process id for batching tasks */
+-	unsigned char		tk_priority : 2,/* Task priority */
+-				tk_rebind_retry : 2;
++	unsigned char		tk_priority : 2;/* Task priority */
++#ifndef __GENKSYMS__
++	unsigned char		tk_rebind_retry : 2;
++#endif
+ #ifdef RPC_DEBUG
+ 	unsigned short		tk_pid;		/* debugging aid */
+ #endif

Modified: dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1	Thu Aug 11 06:03:51 2011	(r17904)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1	Thu Aug 11 06:04:25 2011	(r17905)
@@ -2,3 +2,4 @@
 + bugfix/all/net-fix-memory-leak+corruption-on-VLAN-GRO_DROP.patch
 + bugfix/all/taskstats-don-t-allow-duplicate-entries-in-listener-mode.patch
 + bugfix/all/nlm-dont-hang-forever-on-nlm-unlock-requests.patch
++ debian/nlm-Avoid-ABI-change-from-dont-hang-forever-on-nlm-unlock-requests.patch