[packages/kernel/LINUX_3_0] fix grsec issues in r8169 driver

glen glen at pld-linux.org
Tue Nov 6 14:47:05 CET 2012


commit eb18a7617b79cf3d0679633e80d4fd4fd666b93e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Nov 6 15:46:28 2012 +0200

    fix grsec issues in r8169 driver
    
      CC [M]  drivers/net/r8169.o
    kernel-3.0.50/drivers/net/r8169.c: In function 'rtl_init_jumbo_ops':
    kernel-3.0.50/drivers/net/r8169.c:3417:3: error: assignment of member 'disable' in read-only object
    kernel-3.0.50/drivers/net/r8169.c:3418:3: error: assignment of member 'enable' in read-only object
    ...

 kernel-grsec_full.patch | 11 +++++++++++
 kernel.spec             |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index 16b1f58..54a4c60 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -94,7 +94,7 @@
 
 %define		basever		3.0
 %define		postver		.50
-%define		rel		0.1
+%define		rel		1
 
 %define		_enable_debug_packages			0
 
diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 65e2d64..62760cb 100644
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -78375,3 +78375,14 @@ diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
  
  		/* queue rebind_work, wq doesn't matter, use the default one */
  		if (test_and_set_bit(WORK_STRUCT_PENDING_BIT,
+--- kernel-3.0.50/drivers/net/r8169.c~	2012-11-06 00:12:50.537799620 +0200
++++ kernel-3.0.50/drivers/net/r8169.c	2012-11-06 02:13:12.290664579 +0200
+@@ -685,7 +685,7 @@
+ 	struct jumbo_ops {
+ 		void (*enable)(struct rtl8169_private *);
+ 		void (*disable)(struct rtl8169_private *);
+-	} jumbo_ops;
++	} __no_const jumbo_ops;
+ 
+ 	int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
+ 	int (*get_settings)(struct net_device *, struct ethtool_cmd *);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/eb18a7617b79cf3d0679633e80d4fd4fd666b93e



More information about the pld-cvs-commit mailing list