[gentoo-commits] proj/hardened-patchset:master commit in: 3.10.9/, 3.10.10/

[Anthony G. Basile]

commit:     11ab97af23c6f4c9dc3d3765ce5de3b57e1ad89d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 19:42:59 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 19:47:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=11ab97af

Grsec/PaX: 2.9.1-3.10.10-201308301923

---
 {3.10.9 => 3.10.10}/0000_README                    |   2 +-
 ...420_grsecurity-2.9.1-3.10.10-201308301923.patch | 423 +++++++++++++--------
 {3.10.9 => 3.10.10}/4425_grsec_remove_EI_PAX.patch |   0
 .../4427_force_XATTR_PAX_tmpfs.patch               |   0
 .../4430_grsec-remove-localversion-grsec.patch     |   0
 {3.10.9 => 3.10.10}/4435_grsec-mute-warnings.patch |   0
 .../4440_grsec-remove-protected-paths.patch        |   0
 .../4450_grsec-kconfig-default-gids.patch          |   0
 .../4465_selinux-avc_audit-log-curr_ip.patch       |   0
 {3.10.9 => 3.10.10}/4470_disable-compat_vdso.patch |   0
 {3.10.9 => 3.10.10}/4475_emutramp_default_on.patch |   0
 11 files changed, 271 insertions(+), 154 deletions(-)

diff --git a/3.10.9/0000_README b/3.10.10/0000_README
similarity index 96%
rename from 3.10.9/0000_README
rename to 3.10.10/0000_README
index d335961..bd3df03 100644
--- a/3.10.9/0000_README
+++ b/3.10.10/0000_README
@@ -2,7 +2,7 @@ README
 -----------------------------------------------------------------------------
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.9.1-3.10.9-201308282054.patch
+Patch:	4420_grsecurity-2.9.1-3.10.10-201308301923.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 

diff --git a/3.10.9/4420_grsecurity-2.9.1-3.10.9-201308282054.patch b/3.10.10/4420_grsecurity-2.9.1-3.10.10-201308301923.patch
similarity index 99%
rename from 3.10.9/4420_grsecurity-2.9.1-3.10.9-201308282054.patch
rename to 3.10.10/4420_grsecurity-2.9.1-3.10.10-201308301923.patch
index ed67d72..cd96025 100644
--- a/3.10.9/4420_grsecurity-2.9.1-3.10.9-201308282054.patch
+++ b/3.10.10/4420_grsecurity-2.9.1-3.10.10-201308301923.patch
@@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index 4b31d62..ac99d49 100644
+index b119684..13ac256 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -3632,7 +3632,7 @@ index cad3ca86..1d79e0f 100644
  extern void ux500_cpu_die(unsigned int cpu);
  
 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index 2950082..d0f0782 100644
+index 08c9fe9..191320c 100644
 --- a/arch/arm/mm/Kconfig
 +++ b/arch/arm/mm/Kconfig
 @@ -436,7 +436,7 @@ config CPU_32v5
@@ -3660,8 +3660,8 @@ index 2950082..d0f0782 100644
  	help
  	  Warning: disabling this option may break user programs.
  
-@@ -790,7 +792,7 @@ config KUSER_HELPERS
- 	  run on ARMv4 through to ARMv7 without modification.
+@@ -792,7 +794,7 @@ config KUSER_HELPERS
+ 	  See Documentation/arm/kernel_user_helpers.txt for details.
  
  	  However, the fixed address nature of these helpers can be used
 -	  by ROP (return orientated programming) authors when creating
@@ -5346,7 +5346,7 @@ index 4efe96a..60e8699 100644
  #define SMP_CACHE_BYTES	L1_CACHE_BYTES
  
 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
-index 08b6079..e94e6da 100644
+index 08b6079..8b554d2 100644
 --- a/arch/mips/include/asm/atomic.h
 +++ b/arch/mips/include/asm/atomic.h
 @@ -21,15 +21,39 @@
@@ -5773,39 +5773,51 @@ index 08b6079..e94e6da 100644
  
  /**
   * __atomic_add_unless - add unless the number is a given value
-@@ -324,6 +666,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
  
  #define atomic_dec_return(v) atomic_sub_return(1, (v))
  #define atomic_inc_return(v) atomic_add_return(1, (v))
-+#define atomic_inc_return_unchecked(v) atomic_add_return_unchecked(1, (v))
++static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
++{
++	return atomic_add_return_unchecked(1, v);
++}
  
  /*
   * atomic_sub_and_test - subtract value from variable and test result
-@@ -345,6 +688,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
   * other cases.
   */
  #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
-+#define atomic_inc_and_test_unchecked(v) (atomic_add_return_unchecked(1, (v)) == 0)
++static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
++{
++	return atomic_add_return_unchecked(1, v) == 0;
++}
  
  /*
   * atomic_dec_and_test - decrement by 1 and test
-@@ -369,6 +713,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
   * Atomically increments @v by 1.
   */
  #define atomic_inc(v) atomic_add(1, (v))
-+#define atomic_inc_unchecked(v) atomic_add_unchecked(1, (v))
++static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
++{
++	atomic_add_unchecked(1, v);
++}
  
  /*
   * atomic_dec - decrement and test
-@@ -377,6 +722,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
   * Atomically decrements @v by 1.
   */
  #define atomic_dec(v) atomic_sub(1, (v))
-+#define atomic_dec_unchecked(v) atomic_sub_return_unchecked(1, (v))
++static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
++{
++	atomic_sub_unchecked(1, v);
++}
  
  /*
   * atomic_add_negative - add and test if negative
-@@ -398,14 +744,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
   * @v: pointer of type atomic64_t
   *
   */
@@ -5838,7 +5850,7 @@ index 08b6079..e94e6da 100644
  
  /*
   * atomic64_add - add integer to atomic variable
-@@ -414,7 +776,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
   *
   * Atomically adds @i to @v.
   */
@@ -5906,7 +5918,7 @@ index 08b6079..e94e6da 100644
  {
  	if (kernel_uses_llsc && R10000_LLSC_WAR) {
  		long temp;
-@@ -457,7 +878,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
+@@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
   *
   * Atomically subtracts @i from @v.
   */
@@ -5975,7 +5987,7 @@ index 08b6079..e94e6da 100644
  {
  	if (kernel_uses_llsc && R10000_LLSC_WAR) {
  		long temp;
-@@ -496,7 +977,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
+@@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
  /*
   * Same as above, but return the result value
   */
@@ -6070,7 +6082,7 @@ index 08b6079..e94e6da 100644
  {
  	long result;
  
-@@ -546,7 +1113,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
+@@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
  	return result;
  }
  
@@ -6169,7 +6181,7 @@ index 08b6079..e94e6da 100644
  {
  	long result;
  
-@@ -605,7 +1262,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
+@@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
   * Atomically test @v and subtract @i if @v is greater or equal than @i.
   * The function returns the old value of @v minus @i.
   */
@@ -6178,7 +6190,7 @@ index 08b6079..e94e6da 100644
  {
  	long result;
  
-@@ -662,9 +1319,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
+@@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
  	return result;
  }
  
@@ -6208,7 +6220,7 @@ index 08b6079..e94e6da 100644
  
  /**
   * atomic64_add_unless - add unless the number is a given value
-@@ -694,6 +1368,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
  
  #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
  #define atomic64_inc_return(v) atomic64_add_return(1, (v))
@@ -6216,7 +6228,7 @@ index 08b6079..e94e6da 100644
  
  /*
   * atomic64_sub_and_test - subtract value from variable and test result
-@@ -715,6 +1390,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
   * other cases.
   */
  #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
@@ -6224,7 +6236,7 @@ index 08b6079..e94e6da 100644
  
  /*
   * atomic64_dec_and_test - decrement by 1 and test
-@@ -739,6 +1415,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
   * Atomically increments @v by 1.
   */
  #define atomic64_inc(v) atomic64_add(1, (v))
@@ -6232,7 +6244,7 @@ index 08b6079..e94e6da 100644
  
  /*
   * atomic64_dec - decrement and test
-@@ -747,6 +1424,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
   * Atomically decrements @v by 1.
   */
  #define atomic64_dec(v) atomic64_sub(1, (v))
@@ -25624,7 +25636,7 @@ index 0000000..5877189
 +	return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
 +}
 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
-index 48f8375..ace2781 100644
+index 30277e2..5664a29 100644
 --- a/arch/x86/kernel/sys_x86_64.c
 +++ b/arch/x86/kernel/sys_x86_64.c
 @@ -81,8 +81,8 @@ out:
@@ -25642,8 +25654,8 @@ index 48f8375..ace2781 100644
  				*begin = new_begin;
  		}
  	} else {
--		*begin = mmap_legacy_base();
-+		*begin = mm->mmap_base;
+-		*begin = current->mm->mmap_legacy_base;
++		*begin = mm->mmap_legacy_base;
  		*end = TASK_SIZE;
  	}
  }
@@ -31458,7 +31470,7 @@ index d87dd6d..bf3fa66 100644
  
  	pte = kmemcheck_pte_lookup(address);
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index c1af323..4758dad 100644
+index 5c1ae28..45f4ac9 100644
 --- a/arch/x86/mm/mmap.c
 +++ b/arch/x86/mm/mmap.c
 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
@@ -31498,8 +31510,8 @@ index c1af323..4758dad 100644
   * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
   * does, but not when emulating X86_32
   */
--unsigned long mmap_legacy_base(void)
-+unsigned long mmap_legacy_base(struct mm_struct *mm)
+-static unsigned long mmap_legacy_base(void)
++static unsigned long mmap_legacy_base(struct mm_struct *mm)
  {
 -	if (mmap_is_ia32())
 +	if (mmap_is_ia32()) {
@@ -31516,32 +31528,24 @@ index c1af323..4758dad 100644
  		return TASK_UNMAPPED_BASE + mmap_rnd();
  }
  
-@@ -113,11 +126,23 @@ unsigned long mmap_legacy_base(void)
+@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
+  */
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
- 	if (mmap_is_legacy()) {
--		mm->mmap_base = mmap_legacy_base();
-+		mm->mmap_base = mmap_legacy_base(mm);
+-	mm->mmap_legacy_base = mmap_legacy_base();
+-	mm->mmap_base = mmap_base();
++	mm->mmap_legacy_base = mmap_legacy_base(mm);
++	mm->mmap_base = mmap_base(mm);
 +
 +#ifdef CONFIG_PAX_RANDMMAP
-+		if (mm->pax_flags & MF_PAX_RANDMMAP)
-+			mm->mmap_base += mm->delta_mmap;
-+#endif
-+
- 		mm->get_unmapped_area = arch_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
- 	} else {
--		mm->mmap_base = mmap_base();
-+		mm->mmap_base = mmap_base(mm);
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+		if (mm->pax_flags & MF_PAX_RANDMMAP)
-+			mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
++	if (mm->pax_flags & MF_PAX_RANDMMAP) {
++		mm->mmap_legacy_base += mm->delta_mmap;
++		mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
++	}
 +#endif
-+
- 		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
- 	}
+ 
+ 	if (mmap_is_legacy()) {
+ 		mm->mmap_base = mm->mmap_legacy_base;
 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
 index dc0b727..f612039 100644
 --- a/arch/x86/mm/mmio-mod.c
@@ -34174,7 +34178,7 @@ index fdc3ba2..3daee39 100644
  	.alloc_pud = xen_alloc_pmd_init,
  	.release_pud = xen_release_pmd_init,
 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index d99cae8..18401e1 100644
+index a1e58e1..9392ad8 100644
 --- a/arch/x86/xen/smp.c
 +++ b/arch/x86/xen/smp.c
 @@ -240,11 +240,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
@@ -41619,6 +41623,19 @@ index 0003992..854bbce 100644
  	closure_set_ip(cl);
  	cl->fn = fn;
  	cl->wq = wq;
+diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
+index b4713ce..b30139b 100644
+--- a/drivers/md/bcache/super.c
++++ b/drivers/md/bcache/super.c
+@@ -1603,7 +1603,7 @@ err_unlock_gc:
+ err:
+ 	closure_sync(&op.cl);
+ 	/* XXX: test this, it's broken */
+-	bch_cache_set_error(c, err);
++	bch_cache_set_error(c, "%s", err);
+ }
+ 
+ static bool can_attach_cache(struct cache *ca, struct cache_set *c)
 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
 index 5a2c754..0fa55db 100644
 --- a/drivers/md/bitmap.c
@@ -44228,22 +44245,6 @@ index ae30343..a117806 100644
  
  struct ath_nf_limits {
  	s16 max;
-diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
-index ac07473..e509030 100644
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -523,9 +523,9 @@ static int prism2_ioctl_giwaplist(struct net_device *dev,
- 
- 	data->length = prism2_ap_get_sta_qual(local, addr, qual, IW_MAX_AP, 1);
- 
--	memcpy(extra, &addr, sizeof(struct sockaddr) * data->length);
-+	memcpy(extra, addr, sizeof(struct sockaddr) * data->length);
- 	data->flags = 1; /* has quality information */
--	memcpy(extra + sizeof(struct sockaddr) * data->length, &qual,
-+	memcpy(extra + sizeof(struct sockaddr) * data->length, qual,
- 	       sizeof(struct iw_quality) * data->length);
- 
- 	kfree(addr);
 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
 index b37a582..680835d 100644
 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -44395,8 +44396,29 @@ index d532948..e0d8bb1 100644
  
  	memset(buf, 0, sizeof(buf));
  	buf_size = min(count, sizeof(buf) - 1);
+diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
+index a8afc7b..de058b2 100644
+--- a/drivers/net/wireless/iwlwifi/dvm/main.c
++++ b/drivers/net/wireless/iwlwifi/dvm/main.c
+@@ -1189,7 +1189,7 @@ static void iwl_option_config(struct iwl_priv *priv)
+ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
+ {
+ 	struct iwl_nvm_data *data = priv->nvm_data;
+-	char *debug_msg;
++	static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
+ 
+ 	if (data->sku_cap_11n_enable &&
+ 	    !priv->cfg->ht_params) {
+@@ -1203,7 +1203,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
+ 		return -EINVAL;
+ 	}
+ 
+-	debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
+ 	IWL_DEBUG_INFO(priv, debug_msg,
+ 		       data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
+ 		       data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
-index 50ba0a4..29424e7 100644
+index aeb70e1..d7b5bb5 100644
 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
 @@ -1329,7 +1329,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
@@ -44891,6 +44913,19 @@ index 7d72c5e..edce02c 100644
  	char name[SLOT_NAME_SIZE];
  	int retval = -ENOMEM;
  
+diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
+index 5127f3f..cc115f7 100644
+--- a/drivers/pci/hotplug/pciehp_hpc.c
++++ b/drivers/pci/hotplug/pciehp_hpc.c
+@@ -780,7 +780,7 @@ static int pcie_init_slot(struct controller *ctrl)
+ 		return -ENOMEM;
+ 
+ 	snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl));
+-	slot->wq = alloc_workqueue(name, 0, 0);
++	slot->wq = alloc_workqueue("%s", 0, 0, name);
+ 	if (!slot->wq)
+ 		goto abort;
+ 
 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
 index 5b4a9d9..cd5ac1f 100644
 --- a/drivers/pci/pci-sysfs.c
@@ -45169,6 +45204,19 @@ index 54d31c0..3f896d3 100644
  
  /*
   * Polling driver
+diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
+index e4ac38a..b13344c 100644
+--- a/drivers/platform/x86/wmi.c
++++ b/drivers/platform/x86/wmi.c
+@@ -743,7 +743,7 @@ static int wmi_create_device(const struct guid_block *gblock,
+ 	wblock->dev.class = &wmi_class;
+ 
+ 	wmi_gtoa(gblock->guid, guid_string);
+-	dev_set_name(&wblock->dev, guid_string);
++	dev_set_name(&wblock->dev, "%s", guid_string);
+ 
+ 	dev_set_drvdata(&wblock->dev, wblock);
+ 
 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
 index 769d265..a3a05ca 100644
 --- a/drivers/pnp/pnpbios/bioscalls.c
@@ -46375,7 +46423,7 @@ index f379c7f..e8fc69c 100644
  
  	transport_setup_device(&rport->dev);
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 610417e..1544fa9 100644
+index 610417e..167c46c 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
 @@ -2928,7 +2928,7 @@ static int sd_probe(struct device *dev)
@@ -46387,6 +46435,15 @@ index 610417e..1544fa9 100644
  
  	if (!sdp->request_queue->rq_timeout) {
  		if (sdp->type != TYPE_MOD)
+@@ -2941,7 +2941,7 @@ static int sd_probe(struct device *dev)
+ 	device_initialize(&sdkp->dev);
+ 	sdkp->dev.parent = dev;
+ 	sdkp->dev.class = &sd_disk_class;
+-	dev_set_name(&sdkp->dev, dev_name(dev));
++	dev_set_name(&sdkp->dev, "%s", dev_name(dev));
+ 
+ 	if (device_add(&sdkp->dev))
+ 		goto out_free_index;
 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
 index df5e961..df6b97f 100644
 --- a/drivers/scsi/sg.c
@@ -48356,6 +48413,28 @@ index 028fc83..65bb105 100644
  }
  
  /*
+diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
+index 6d78736..65be90e 100644
+--- a/drivers/vfio/vfio.c
++++ b/drivers/vfio/vfio.c
+@@ -486,7 +486,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
+ 		return 0;
+ 
+ 	/* TODO Prevent device auto probing */
+-	WARN("Device %s added to live group %d!\n", dev_name(dev),
++	WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
+ 	     iommu_group_id(group->iommu_group));
+ 
+ 	return 0;
+@@ -506,7 +506,7 @@ static int vfio_group_nb_del_dev(struct vfio_group *group, struct device *dev)
+ 	if (likely(!device))
+ 		return 0;
+ 
+-	WARN("Device %s removed from live group %d!\n", dev_name(dev),
++	WARN(1, "Device %s removed from live group %d!\n", dev_name(dev),
+ 	     iommu_group_id(group->iommu_group));
+ 
+ 	vfio_device_put(device);
 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
 index 5174eba..86e764a 100644
 --- a/drivers/vhost/vringh.c
@@ -51745,19 +51824,6 @@ index 88714ae..16c2e11 100644
  
  
  static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index 6a6bbe4..c733886 100644
---- a/drivers/xen/events.c
-+++ b/drivers/xen/events.c
-@@ -346,7 +346,7 @@ static void init_evtchn_cpu_bindings(void)
- 
- 	for_each_possible_cpu(i)
- 		memset(per_cpu(cpu_evtchn_mask, i),
--		       (i == 0) ? ~0 : 0, sizeof(*per_cpu(cpu_evtchn_mask, i)));
-+		       (i == 0) ? ~0 : 0, NR_EVENT_CHANNELS/8);
- }
- 
- static inline void clear_evtchn(int port)
 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
 index fef20db..d28b1ab 100644
 --- a/drivers/xen/xenfs/xenstored.c
@@ -53024,38 +53090,10 @@ index d50bbe5..af3b649 100644
  			goto err;
  		}
 diff --git a/fs/bio.c b/fs/bio.c
-index 94bbc04..599e3cf 100644
+index c5eae72..599e3cf 100644
 --- a/fs/bio.c
 +++ b/fs/bio.c
-@@ -1045,12 +1045,22 @@ static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,
- int bio_uncopy_user(struct bio *bio)
- {
- 	struct bio_map_data *bmd = bio->bi_private;
--	int ret = 0;
-+	struct bio_vec *bvec;
-+	int ret = 0, i;
- 
--	if (!bio_flagged(bio, BIO_NULL_MAPPED))
--		ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs,
--				     bmd->nr_sgvecs, bio_data_dir(bio) == READ,
--				     0, bmd->is_our_pages);
-+	if (!bio_flagged(bio, BIO_NULL_MAPPED)) {
-+		/*
-+		 * if we're in a workqueue, the request is orphaned, so
-+		 * don't copy into a random user address space, just free.
-+		 */
-+		if (current->mm)
-+			ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs,
-+					     bmd->nr_sgvecs, bio_data_dir(bio) == READ,
-+					     0, bmd->is_our_pages);
-+		else if (bmd->is_our_pages)
-+			bio_for_each_segment_all(bvec, bio, i)
-+				__free_page(bvec->bv_page);
-+	}
- 	bio_free_map_data(bmd);
- 	bio_put(bio);
- 	return ret;
-@@ -1096,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
+@@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
  		/*
  		 * Overflow, abort
  		 */
@@ -53064,7 +53102,7 @@ index 94bbc04..599e3cf 100644
  			return ERR_PTR(-EINVAL);
  
  		nr_pages += end - start;
-@@ -1230,7 +1240,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
+@@ -1240,7 +1240,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
  		/*
  		 * Overflow, abort
  		 */
@@ -53073,7 +53111,7 @@ index 94bbc04..599e3cf 100644
  			return ERR_PTR(-EINVAL);
  
  		nr_pages += end - start;
-@@ -1492,7 +1502,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
+@@ -1502,7 +1502,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
  	const int read = bio_data_dir(bio) == READ;
  	struct bio_map_data *bmd = bio->bi_private;
  	int i;
@@ -57666,7 +57704,7 @@ index 9ed9361..2b72db1 100644
  out:
  	return len;
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 7b1ca9b..6faeccf 100644
+index a45ba4f..e7dc489 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -1265,6 +1265,9 @@ static int do_umount(struct mount *mnt, int flags)
@@ -58095,6 +58133,37 @@ index c5670b8..2b43d9b 100644
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
+diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
+index 82650d5..db37dcf 100644
+--- a/fs/ntfs/super.c
++++ b/fs/ntfs/super.c
+@@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+ 		if (!silent)
+ 			ntfs_error(sb, "Primary boot sector is invalid.");
+ 	} else if (!silent)
+-		ntfs_error(sb, read_err_str, "primary");
++		ntfs_error(sb, read_err_str, "%s", "primary");
+ 	if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
+ 		if (bh_primary)
+ 			brelse(bh_primary);
+@@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+ 			goto hotfix_primary_boot_sector;
+ 		brelse(bh_backup);
+ 	} else if (!silent)
+-		ntfs_error(sb, read_err_str, "backup");
++		ntfs_error(sb, read_err_str, "%s", "backup");
+ 	/* Try to read NT3.51- backup boot sector. */
+ 	if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
+ 		if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
+@@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+ 					"sector.");
+ 		brelse(bh_backup);
+ 	} else if (!silent)
+-		ntfs_error(sb, read_err_str, "backup");
++		ntfs_error(sb, read_err_str, "%s", "backup");
+ 	/* We failed. Cleanup and return. */
+ 	if (bh_primary)
+ 		brelse(bh_primary);
 diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
 index 20dfec7..e238cb7 100644
 --- a/fs/ocfs2/aops.c
@@ -70750,10 +70819,10 @@ index 0000000..4030d57
 +}
 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
 new file mode 100644
-index 0000000..301c665
+index 0000000..a9e378f
 --- /dev/null
 +++ b/grsecurity/grsec_sysctl.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,472 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/sysctl.h>
@@ -70774,11 +70843,12 @@ index 0000000..301c665
 +	return 0;
 +}
 +
-+#ifdef CONFIG_GRKERNSEC_ROFS
-+static int __maybe_unused one = 1;
++#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
++static int __maybe_unused __read_only one = 1;
 +#endif
 +
-+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
++#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
++	defined(CONFIG_GRKERNSEC_DENYUSB)
 +struct ctl_table grsecurity_table[] = {
 +#ifdef CONFIG_GRKERNSEC_SYSCTL
 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
@@ -75150,7 +75220,7 @@ index e0c8528..bcf0c29 100644
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index ace9a5f..81bdb59 100644
+index 4a189ba..04101d6 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -289,6 +289,8 @@ struct vm_area_struct {
@@ -75162,7 +75232,7 @@ index ace9a5f..81bdb59 100644
  };
  
  struct core_thread {
-@@ -437,6 +439,24 @@ struct mm_struct {
+@@ -438,6 +440,24 @@ struct mm_struct {
  	int first_nid;
  #endif
  	struct uprobes_state uprobes_state;
@@ -76098,7 +76168,7 @@ index 6dacb93..6174423 100644
  static inline void anon_vma_merge(struct vm_area_struct *vma,
  				  struct vm_area_struct *next)
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 3aeb14b..73816a6 100644
+index 178a8d9..918ea01 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -62,6 +62,7 @@ struct bio_list;
@@ -76118,11 +76188,10 @@ index 3aeb14b..73816a6 100644
  extern signed long schedule_timeout_interruptible(signed long timeout);
  extern signed long schedule_timeout_killable(signed long timeout);
  extern signed long schedule_timeout_uninterruptible(signed long timeout);
-@@ -314,7 +315,19 @@ struct nsproxy;
+@@ -314,6 +315,18 @@ struct nsproxy;
  struct user_namespace;
  
  #ifdef CONFIG_MMU
--extern unsigned long mmap_legacy_base(void);
 +
 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
@@ -76135,11 +76204,10 @@ index 3aeb14b..73816a6 100644
 +
 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
-+extern unsigned long mmap_legacy_base(struct mm_struct *mm);
  extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -592,6 +605,17 @@ struct signal_struct {
+@@ -591,6 +604,17 @@ struct signal_struct {
  #ifdef CONFIG_TASKSTATS
  	struct taskstats *stats;
  #endif
@@ -76157,7 +76225,7 @@ index 3aeb14b..73816a6 100644
  #ifdef CONFIG_AUDIT
  	unsigned audit_tty;
  	unsigned audit_tty_log_passwd;
-@@ -672,6 +696,14 @@ struct user_struct {
+@@ -671,6 +695,14 @@ struct user_struct {
  	struct key *session_keyring;	/* UID's default session keyring */
  #endif
  
@@ -76172,7 +76240,7 @@ index 3aeb14b..73816a6 100644
  	/* Hash table maintenance information */
  	struct hlist_node uidhash_node;
  	kuid_t uid;
-@@ -1159,8 +1191,8 @@ struct task_struct {
+@@ -1158,8 +1190,8 @@ struct task_struct {
  	struct list_head thread_group;
  
  	struct completion *vfork_done;		/* for vfork() */
@@ -76183,7 +76251,7 @@ index 3aeb14b..73816a6 100644
  
  	cputime_t utime, stime, utimescaled, stimescaled;
  	cputime_t gtime;
-@@ -1185,11 +1217,6 @@ struct task_struct {
+@@ -1184,11 +1216,6 @@ struct task_struct {
  	struct task_cputime cputime_expires;
  	struct list_head cpu_timers[3];
  
@@ -76195,7 +76263,7 @@ index 3aeb14b..73816a6 100644
  	char comm[TASK_COMM_LEN]; /* executable name excluding path
  				     - access with [gs]et_task_comm (which lock
  				       it with task_lock())
-@@ -1206,6 +1233,10 @@ struct task_struct {
+@@ -1205,6 +1232,10 @@ struct task_struct {
  #endif
  /* CPU-specific state of this task */
  	struct thread_struct thread;
@@ -76206,7 +76274,7 @@ index 3aeb14b..73816a6 100644
  /* filesystem information */
  	struct fs_struct *fs;
  /* open file information */
-@@ -1279,6 +1310,10 @@ struct task_struct {
+@@ -1278,6 +1309,10 @@ struct task_struct {
  	gfp_t lockdep_reclaim_gfp;
  #endif
  
@@ -76217,7 +76285,7 @@ index 3aeb14b..73816a6 100644
  /* journalling filesystem info */
  	void *journal_info;
  
-@@ -1317,6 +1352,10 @@ struct task_struct {
+@@ -1316,6 +1351,10 @@ struct task_struct {
  	/* cg_list protected by css_set_lock and tsk->alloc_lock */
  	struct list_head cg_list;
  #endif
@@ -76228,7 +76296,7 @@ index 3aeb14b..73816a6 100644
  #ifdef CONFIG_FUTEX
  	struct robust_list_head __user *robust_list;
  #ifdef CONFIG_COMPAT
-@@ -1417,8 +1456,76 @@ struct task_struct {
+@@ -1416,8 +1455,76 @@ struct task_struct {
  	unsigned int	sequential_io;
  	unsigned int	sequential_io_avg;
  #endif
@@ -76305,7 +76373,7 @@ index 3aeb14b..73816a6 100644
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -1477,7 +1584,7 @@ struct pid_namespace;
+@@ -1476,7 +1583,7 @@ struct pid_namespace;
  pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
  			struct pid_namespace *ns);
  
@@ -76314,7 +76382,7 @@ index 3aeb14b..73816a6 100644
  {
  	return tsk->pid;
  }
-@@ -1920,7 +2027,9 @@ void yield(void);
+@@ -1919,7 +2026,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -76324,7 +76392,7 @@ index 3aeb14b..73816a6 100644
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -1953,6 +2062,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -1952,6 +2061,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -76332,7 +76400,7 @@ index 3aeb14b..73816a6 100644
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
  		struct pid_namespace *ns);
  
-@@ -2119,7 +2229,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2118,7 +2228,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -76341,7 +76409,7 @@ index 3aeb14b..73816a6 100644
  
  extern int allow_signal(int);
  extern int disallow_signal(int);
-@@ -2310,9 +2420,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+@@ -2309,9 +2419,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
  
  #endif
  
@@ -77412,6 +77480,25 @@ index c586679..f06b389 100644
  }
  
  static inline void __dec_zone_page_state(struct page *page,
+diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
+index 623488f..44b5742 100644
+--- a/include/linux/workqueue.h
++++ b/include/linux/workqueue.h
+@@ -410,11 +410,11 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
+ 	alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args)
+ 
+ #define create_workqueue(name)						\
+-	alloc_workqueue((name), WQ_MEM_RECLAIM, 1)
++	alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, (name))
+ #define create_freezable_workqueue(name)				\
+-	alloc_workqueue((name), WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1)
++	alloc_workqueue("%s", WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name))
+ #define create_singlethread_workqueue(name)				\
+-	alloc_workqueue((name), WQ_UNBOUND | WQ_MEM_RECLAIM, 1)
++	alloc_workqueue("%s", WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name))
+ 
+ extern void destroy_workqueue(struct workqueue_struct *wq);
+ 
 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
 index fdbafc6..49dfe4f 100644
 --- a/include/linux/xattr.h
@@ -84555,10 +84642,10 @@ index b8b8560..75b1a09 100644
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index 6c508ff..ee55a13 100644
+index f23449d..b8cc3a1 100644
 --- a/kernel/trace/ftrace.c
 +++ b/kernel/trace/ftrace.c
-@@ -1915,12 +1915,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
+@@ -1925,12 +1925,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
  	if (unlikely(ftrace_disabled))
  		return 0;
  
@@ -84578,7 +84665,7 @@ index 6c508ff..ee55a13 100644
  }
  
  /*
-@@ -3931,8 +3936,10 @@ static int ftrace_process_locs(struct module *mod,
+@@ -3994,8 +3999,10 @@ static int ftrace_process_locs(struct module *mod,
  	if (!count)
  		return 0;
  
@@ -84589,7 +84676,7 @@ index 6c508ff..ee55a13 100644
  
  	start_pg = ftrace_allocate_pages(count);
  	if (!start_pg)
-@@ -4655,8 +4662,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
+@@ -4718,8 +4725,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
  
  static int ftrace_graph_active;
@@ -84598,7 +84685,7 @@ index 6c508ff..ee55a13 100644
  int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
  {
  	return 0;
-@@ -4800,6 +4805,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
+@@ -4863,6 +4868,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
  	return NOTIFY_DONE;
  }
  
@@ -84609,7 +84696,7 @@ index 6c508ff..ee55a13 100644
  int register_ftrace_graph(trace_func_graph_ret_t retfunc,
  			trace_func_graph_ent_t entryfunc)
  {
-@@ -4813,7 +4822,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+@@ -4876,7 +4885,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
  		goto out;
  	}
  
@@ -84896,10 +84983,10 @@ index e444ff8..438b8f4 100644
  		*data_page = bpage;
  
 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 06a5bce..53ad6e7 100644
+index 0582a01..310bed1 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -3347,7 +3347,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
+@@ -3327,7 +3327,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
  	return 0;
  }
  
@@ -84922,10 +85009,10 @@ index 51b4448..7be601f 100644
  /*
   * Normal trace_printk() and friends allocates special buffers
 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 6953263..2004e16 100644
+index 3d18aad..d1be0eb 100644
 --- a/kernel/trace/trace_events.c
 +++ b/kernel/trace/trace_events.c
-@@ -1748,10 +1748,6 @@ static LIST_HEAD(ftrace_module_file_list);
+@@ -1794,10 +1794,6 @@ static LIST_HEAD(ftrace_module_file_list);
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
@@ -84936,7 +85023,7 @@ index 6953263..2004e16 100644
  };
  
  static struct ftrace_module_file_ops *
-@@ -1792,17 +1788,12 @@ trace_create_file_ops(struct module *mod)
+@@ -1838,17 +1834,12 @@ trace_create_file_ops(struct module *mod)
  
  	file_ops->mod = mod;
  
@@ -84960,7 +85047,7 @@ index 6953263..2004e16 100644
  
  	list_add(&file_ops->list, &ftrace_module_file_list);
  
-@@ -1895,8 +1886,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call,
+@@ -1941,8 +1932,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call,
  			  struct ftrace_module_file_ops *file_ops)
  {
  	return __trace_add_new_event(call, tr,
@@ -94239,7 +94326,7 @@ index 514e90f..56f22bf 100644
  }
  
 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index 8a7bfc4..4407cd0 100644
+index 8a7bfc4..be07e86 100644
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
 @@ -181,7 +181,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
@@ -94251,6 +94338,15 @@ index 8a7bfc4..4407cd0 100644
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
+@@ -921,7 +921,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
+ 		hw->queues = IEEE80211_MAX_QUEUES;
+ 
+ 	local->workqueue =
+-		alloc_ordered_workqueue(wiphy_name(local->hw.wiphy), 0);
++		alloc_ordered_workqueue("%s", 0, wiphy_name(local->hw.wiphy));
+ 	if (!local->workqueue) {
+ 		result = -ENOMEM;
+ 		goto fail_workqueue;
 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
 index 3401262..d5cd68d 100644
 --- a/net/mac80211/pm.c
@@ -99456,6 +99552,27 @@ index 7d8803a..559f8d0 100644
  
                  list_add(&s->list, &cs4297a_devs);
  
+diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
+index 55108b5..d973e11 100644
+--- a/sound/pci/hda/hda_codec.c
++++ b/sound/pci/hda/hda_codec.c
+@@ -916,14 +916,10 @@ find_codec_preset(struct hda_codec *codec)
+ 	mutex_unlock(&preset_mutex);
+ 
+ 	if (mod_requested < HDA_MODREQ_MAX_COUNT) {
+-		char name[32];
+ 		if (!mod_requested)
+-			snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
+-				 codec->vendor_id);
++			request_module("snd-hda-codec-id:%08x", codec->vendor_id);
+ 		else
+-			snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
+-				 (codec->vendor_id >> 16) & 0xffff);
+-		request_module(name);
++			request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
+ 		mod_requested++;
+ 		goto again;
+ 	}
 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
 index 4631a23..001ae57 100644
 --- a/sound/pci/ymfpci/ymfpci.h

diff --git a/3.10.9/4425_grsec_remove_EI_PAX.patch b/3.10.10/4425_grsec_remove_EI_PAX.patch
similarity index 100%
rename from 3.10.9/4425_grsec_remove_EI_PAX.patch
rename to 3.10.10/4425_grsec_remove_EI_PAX.patch

diff --git a/3.10.9/4427_force_XATTR_PAX_tmpfs.patch b/3.10.10/4427_force_XATTR_PAX_tmpfs.patch
similarity index 100%
rename from 3.10.9/4427_force_XATTR_PAX_tmpfs.patch
rename to 3.10.10/4427_force_XATTR_PAX_tmpfs.patch

diff --git a/3.10.9/4430_grsec-remove-localversion-grsec.patch b/3.10.10/4430_grsec-remove-localversion-grsec.patch
similarity index 100%
rename from 3.10.9/4430_grsec-remove-localversion-grsec.patch
rename to 3.10.10/4430_grsec-remove-localversion-grsec.patch

diff --git a/3.10.9/4435_grsec-mute-warnings.patch b/3.10.10/4435_grsec-mute-warnings.patch
similarity index 100%
rename from 3.10.9/4435_grsec-mute-warnings.patch
rename to 3.10.10/4435_grsec-mute-warnings.patch

diff --git a/3.10.9/4440_grsec-remove-protected-paths.patch b/3.10.10/4440_grsec-remove-protected-paths.patch
similarity index 100%
rename from 3.10.9/4440_grsec-remove-protected-paths.patch
rename to 3.10.10/4440_grsec-remove-protected-paths.patch

diff --git a/3.10.9/4450_grsec-kconfig-default-gids.patch b/3.10.10/4450_grsec-kconfig-default-gids.patch
similarity index 100%
rename from 3.10.9/4450_grsec-kconfig-default-gids.patch
rename to 3.10.10/4450_grsec-kconfig-default-gids.patch

diff --git a/3.10.9/4465_selinux-avc_audit-log-curr_ip.patch b/3.10.10/4465_selinux-avc_audit-log-curr_ip.patch
similarity index 100%
rename from 3.10.9/4465_selinux-avc_audit-log-curr_ip.patch
rename to 3.10.10/4465_selinux-avc_audit-log-curr_ip.patch

diff --git a/3.10.9/4470_disable-compat_vdso.patch b/3.10.10/4470_disable-compat_vdso.patch
similarity index 100%
rename from 3.10.9/4470_disable-compat_vdso.patch
rename to 3.10.10/4470_disable-compat_vdso.patch

diff --git a/3.10.9/4475_emutramp_default_on.patch b/3.10.10/4475_emutramp_default_on.patch
similarity index 100%
rename from 3.10.9/4475_emutramp_default_on.patch
rename to 3.10.10/4475_emutramp_default_on.patch