main/linux-virt-grsec: upgrade to 3.10.37

2 files changed, 69 insertions, 77 deletions

diff --git a/main/linux-virt-grsec/APKBUILD b/main/linux-virt-grsec/APKBUILD
index e553035750..0199328998 100644
--- a/main/linux-virt-grsec/APKBUILD
+++ b/main/linux-virt-grsec/APKBUILD
@@ -3,7 +3,7 @@
 
 _flavor=virt-grsec
 pkgname=linux-${_flavor}
-pkgver=3.10.36
+pkgver=3.10.37
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
@@ -153,8 +153,8 @@ dev() {
 }
 
 md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
-19dad5e1e0797edd7278c933bd84ad78  patch-3.10.36.xz
-458bc8540db61a161397e9de2246dea0  grsecurity-2.9.1-3.10.36-unofficial.patch
+0e0d007bcb00c0ce3a6f83bbeecbb3b4  patch-3.10.37.xz
+9a5db9db27532a463e45f2bff702af5c  grsecurity-2.9.1-3.10.37-unofficial.patch
 a16f11b12381efb3bec79b9bfb329836  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 656ae7b10dd2f18dbfa1011041d08d60  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 aa454ffb96428586447775c21449e284  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -166,8 +166,8 @@ b3c0153d53e508e03d73b94d15b24a96  sysctl_lxc.patch
 539c848d541c1656851fe865018273df  kernelconfig.x86
 82cd965fc82651f2e6b35e75c17d8031  kernelconfig.x86_64"
 sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544  linux-3.10.tar.xz
-76d7e401c32f85a7943ad9a91d4007ef5a09c014087038ede884d129255cd24b  patch-3.10.36.xz
-5e35f1094419ae19f95cd5b13bf4b428c5b7b6209e512750a83ae76b79062c3c  grsecurity-2.9.1-3.10.36-unofficial.patch
+259d679a0a8c33bb3ddf97a8c14ce443a53be55239dcae24837317b275ce76ad  patch-3.10.37.xz
+2db8b3f5b55eefa506111ec84218f940afc5ddc06b392dba6fbc0073a6215d0a  grsecurity-2.9.1-3.10.37-unofficial.patch
 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -179,8 +179,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e  0006-ipv4-use-
 997d4c8a5a2b911047d26fe1bf8ee8d5cd3b7133e6abdc07b7deacd0b3eb2330  kernelconfig.x86
 7845194551137fbc3b69a75249696bc843bb7fe7f4a4e6b0582c0ca0856caa64  kernelconfig.x86_64"
 sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35  linux-3.10.tar.xz
-7e0464c4e6b82cf3db4835b2ec9f232a2a2b979f12cb089e63fdb5f1cb11d6abe6b3a0614058eaef8c7b2d4046b7311dde361ff62e32b5908a93430699750483  patch-3.10.36.xz
-8bdd1db67136ae9edfd35d232929a0ae4bdc7caee50984e86c11f1af60474b27becc2acd570cd509beca55e7d15a9f4bc43956f6a75a3fe7e3013dded9fab8a0  grsecurity-2.9.1-3.10.36-unofficial.patch
+bbe1088dae3b7cc5331d7d5d52f6272ad47b5bde8a1afed15e1944a03fbe12ed9864bc3818beb761099e9d8b48658b2ee739da534e60e7a4e0dcf50914f57686  patch-3.10.37.xz
+3f6331c23bb32e64882d01186a7c98bbc4ae32b294a1f1fa257798b8e79a8852751c489ec27db08be665b8055a0a66c28450e3e961d560ff64dd9396c282533b  grsecurity-2.9.1-3.10.37-unofficial.patch
 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
diff --git a/main/linux-virt-grsec/grsecurity-2.9.1-3.10.36-unofficial.patch b/main/linux-virt-grsec/grsecurity-2.9.1-3.10.37-unofficial.patch
index 8a30a16d20..ba581768c6 100644
--- a/main/linux-virt-grsec/grsecurity-2.9.1-3.10.36-unofficial.patch
+++ b/main/linux-virt-grsec/grsecurity-2.9.1-3.10.37-unofficial.patch
@@ -281,7 +281,7 @@ index 1311a48..f233324 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index b5f4ef3..f70bdec 100644
+index bd9fb5b..9e2e9b6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -12928,7 +12928,7 @@ index dbc4339..3d868c5 100644
  
          ################################################################
 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
-index 586f41a..d02851e 100644
+index 185fad4..ff4cd36 100644
 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
 @@ -18,6 +18,7 @@
@@ -12939,7 +12939,7 @@ index 586f41a..d02851e 100644
  
  .data
  
-@@ -93,6 +94,7 @@ __clmul_gf128mul_ble:
+@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
  	psrlq $1, T2
  	pxor T2, T1
  	pxor T1, DATA
@@ -12947,7 +12947,7 @@ index 586f41a..d02851e 100644
  	ret
  ENDPROC(__clmul_gf128mul_ble)
  
-@@ -105,6 +107,7 @@ ENTRY(clmul_ghash_mul)
+@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
  	call __clmul_gf128mul_ble
  	PSHUFB_XMM BSWAP DATA
  	movups DATA, (%rdi)
@@ -12955,21 +12955,13 @@ index 586f41a..d02851e 100644
  	ret
  ENDPROC(clmul_ghash_mul)
  
-@@ -132,6 +135,7 @@ ENTRY(clmul_ghash_update)
+@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
  	PSHUFB_XMM BSWAP DATA
  	movups DATA, (%rdi)
  .Lupdate_just_ret:
 +	pax_force_retaddr
  	ret
  ENDPROC(clmul_ghash_update)
- 
-@@ -157,5 +161,6 @@ ENTRY(clmul_ghash_setkey)
- 	pand .Lpoly, %xmm1
- 	pxor %xmm1, %xmm0
- 	movups %xmm0, (%rdi)
-+	pax_force_retaddr
- 	ret
- ENDPROC(clmul_ghash_setkey)
 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
 index 9279e0b..9270820 100644
 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
@@ -37664,10 +37656,10 @@ index edc089e..bc7c0bc 100644
  	pr_debug("CPU%u - ACPI performance management activated.\n", cpu);
  	for (i = 0; i < perf->state_count; i++)
 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 6485547..477033e 100644
+index 66f6cf5..80c1cf6 100644
 --- a/drivers/cpufreq/cpufreq.c
 +++ b/drivers/cpufreq/cpufreq.c
-@@ -1854,7 +1854,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
+@@ -1878,7 +1878,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
  	return NOTIFY_OK;
  }
  
@@ -37676,7 +37668,7 @@ index 6485547..477033e 100644
      .notifier_call = cpufreq_cpu_callback,
  };
  
-@@ -1886,8 +1886,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+@@ -1910,8 +1910,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
  
  	pr_debug("trying to register driver %s\n", driver_data->name);
  
@@ -37691,10 +37683,10 @@ index 6485547..477033e 100644
  	write_lock_irqsave(&cpufreq_driver_lock, flags);
  	if (cpufreq_driver) {
 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
-index a86ff72..aad2b03 100644
+index 28a0b32..0c26559 100644
 --- a/drivers/cpufreq/cpufreq_governor.c
 +++ b/drivers/cpufreq/cpufreq_governor.c
-@@ -235,7 +235,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -238,7 +238,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
  	struct dbs_data *dbs_data;
  	struct od_cpu_dbs_info_s *od_dbs_info = NULL;
  	struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
@@ -37703,7 +37695,7 @@ index a86ff72..aad2b03 100644
  	struct od_dbs_tuners *od_tuners = NULL;
  	struct cs_dbs_tuners *cs_tuners = NULL;
  	struct cpu_dbs_common_info *cpu_cdbs;
-@@ -298,7 +298,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -301,7 +301,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
  
  		if ((cdata->governor == GOV_CONSERVATIVE) &&
  				(!policy->governor->initialized)) {
@@ -37712,7 +37704,7 @@ index a86ff72..aad2b03 100644
  
  			cpufreq_register_notifier(cs_ops->notifier_block,
  					CPUFREQ_TRANSITION_NOTIFIER);
-@@ -315,7 +315,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -318,7 +318,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
  
  			if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
  				(policy->governor->initialized == 1)) {
@@ -38629,7 +38621,7 @@ index d4b20ce..77a8d41 100644
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
-index 2f4c434..dd12cd2 100644
+index 2f4c4343..dd12cd2 100644
 --- a/drivers/gpu/drm/drm_ioc32.c
 +++ b/drivers/gpu/drm/drm_ioc32.c
 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
@@ -44293,10 +44285,10 @@ index a79e9d3..78cd4fa 100644
  
  	/* we will have to manufacture ethernet headers, prepare template */
 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 054489f..aee050a 100644
+index 9673edf..e228fa6 100644
 --- a/drivers/net/vxlan.c
 +++ b/drivers/net/vxlan.c
-@@ -1579,7 +1579,7 @@ nla_put_failure:
+@@ -1582,7 +1582,7 @@ nla_put_failure:
  	return -EMSGSIZE;
  }
  
@@ -73401,10 +73393,10 @@ index 9f3c7e8..a18c7b6 100644
  	register_cpu_notifier(&fn##_nb);			\
  }
 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 037d36a..ca5fe6e 100644
+index 1a81b74..3fc87b8 100644
 --- a/include/linux/cpufreq.h
 +++ b/include/linux/cpufreq.h
-@@ -262,7 +262,7 @@ struct cpufreq_driver {
+@@ -263,7 +263,7 @@ struct cpufreq_driver {
  	int	(*suspend)	(struct cpufreq_policy *policy);
  	int	(*resume)	(struct cpufreq_policy *policy);
  	struct freq_attr	**attr;
@@ -73413,7 +73405,7 @@ index 037d36a..ca5fe6e 100644
  
  /* flags */
  
-@@ -321,6 +321,7 @@ struct global_attr {
+@@ -322,6 +322,7 @@ struct global_attr {
  	ssize_t (*store)(struct kobject *a, struct attribute *b,
  			 const char *c, size_t count);
  };
@@ -78856,7 +78848,7 @@ index 1bd4c41..9250b5b 100644
  
  /* Structure to track chunk fragments that have been acked, but peer
 diff --git a/include/net/sock.h b/include/net/sock.h
-index cec4c72..66ba735 100644
+index 8f32b77..35fd6d2 100644
 --- a/include/net/sock.h
 +++ b/include/net/sock.h
 @@ -326,7 +326,7 @@ struct sock {
@@ -78868,7 +78860,7 @@ index cec4c72..66ba735 100644
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-@@ -1799,7 +1799,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+@@ -1804,7 +1804,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
  }
  
  static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
@@ -78877,7 +78869,7 @@ index cec4c72..66ba735 100644
  					   int copy, int offset)
  {
  	if (skb->ip_summed == CHECKSUM_NONE) {
-@@ -2058,7 +2058,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
+@@ -2063,7 +2063,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
  	}
  }
  
@@ -79422,7 +79414,7 @@ index 1a91850..28573f8 100644
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
 diff --git a/init/Kconfig b/init/Kconfig
-index 2d9b831..ae4c8ac 100644
+index 5d6feba..eaad320 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
 @@ -1029,6 +1029,7 @@ endif # CGROUPS
@@ -79433,7 +79425,7 @@ index 2d9b831..ae4c8ac 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1516,7 +1517,7 @@ config SLUB_DEBUG
+@@ -1523,7 +1524,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
  	bool "Disable heap randomization"
@@ -79442,7 +79434,7 @@ index 2d9b831..ae4c8ac 100644
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-@@ -1779,7 +1780,7 @@ config INIT_ALL_POSSIBLE
+@@ -1786,7 +1787,7 @@ config INIT_ALL_POSSIBLE
  config STOP_MACHINE
  	bool
  	default y
@@ -81395,7 +81387,7 @@ index ff7be9d..c27d611 100644
  			else
  				new_fs = fs;
 diff --git a/kernel/futex.c b/kernel/futex.c
-index a283b30..e35635d 100644
+index 3bc18bf..94d1e77 100644
 --- a/kernel/futex.c
 +++ b/kernel/futex.c
 @@ -54,6 +54,7 @@
@@ -81406,7 +81398,7 @@ index a283b30..e35635d 100644
  #include <linux/signal.h>
  #include <linux/export.h>
  #include <linux/magic.h>
-@@ -242,6 +243,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
+@@ -244,6 +245,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
  	struct page *page, *page_head;
  	int err, ro = 0;
  
@@ -81418,7 +81410,7 @@ index a283b30..e35635d 100644
  	/*
  	 * The futex address must be "naturally" aligned.
  	 */
-@@ -440,7 +446,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
+@@ -442,7 +448,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
  
  static int get_futex_value_locked(u32 *dest, u32 __user *from)
  {
@@ -81427,15 +81419,15 @@ index a283b30..e35635d 100644
  
  	pagefault_disable();
  	ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
-@@ -2733,6 +2739,7 @@ static int __init futex_init(void)
+@@ -2735,6 +2741,7 @@ static void __init futex_detect_cmpxchg(void)
  {
+ #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
  	u32 curval;
- 	int i;
 +	mm_segment_t oldfs;
  
  	/*
  	 * This will fail and we want it. Some arch implementations do
-@@ -2744,8 +2751,11 @@ static int __init futex_init(void)
+@@ -2746,8 +2753,11 @@ static void __init futex_detect_cmpxchg(void)
  	 * implementation, the non-functional ones will return
  	 * -ENOSYS.
  	 */
@@ -81444,9 +81436,9 @@ index a283b30..e35635d 100644
  	if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
  		futex_cmpxchg_enabled = 1;
 +	set_fs(oldfs);
+ #endif
+ }
  
- 	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
- 		plist_head_init(&futex_queues[i].chain);
 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
 index f9f44fd..29885e4 100644
 --- a/kernel/futex_compat.c
@@ -91511,10 +91503,10 @@ index 10bbb54..7a0cf21 100644
  	return 0;
  }
 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
-index 9424f37..6aabf19 100644
+index 86abb2e..67c6e96 100644
 --- a/net/8021q/vlan.c
 +++ b/net/8021q/vlan.c
-@@ -469,7 +469,7 @@ out:
+@@ -471,7 +471,7 @@ out:
  	return NOTIFY_DONE;
  }
  
@@ -91523,7 +91515,7 @@ index 9424f37..6aabf19 100644
  	.notifier_call = vlan_device_event,
  };
  
-@@ -544,8 +544,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
+@@ -546,8 +546,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
  		err = -EPERM;
  		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
  			break;
@@ -92703,7 +92695,7 @@ index f9765203..9feaef8 100644
  	return error;
  }
 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index 433a105..8f0dd0e 100644
+index e861438..746731f 100644
 --- a/net/core/netpoll.c
 +++ b/net/core/netpoll.c
 @@ -435,7 +435,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
@@ -92725,7 +92717,7 @@ index 433a105..8f0dd0e 100644
  		iph->ttl      = 64;
  		iph->protocol = IPPROTO_UDP;
 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index fd01eca..502ca49 100644
+index 4c3087d..2707448 100644
 --- a/net/core/rtnetlink.c
 +++ b/net/core/rtnetlink.c
 @@ -58,7 +58,7 @@ struct rtnl_link {
@@ -92826,7 +92818,7 @@ index 79143b7..4329760 100644
  }
  
 diff --git a/net/core/sock.c b/net/core/sock.c
-index 3ba5270..4036f92 100644
+index d743099..61af31f 100644
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
 @@ -390,7 +390,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
@@ -94202,7 +94194,7 @@ index 9a459be..086b866 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index b78a3ee..8f5113c 100644
+index 7bcdd0d..3499b59 100644
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
 @@ -621,7 +621,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
@@ -94214,7 +94206,7 @@ index b78a3ee..8f5113c 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -2405,7 +2405,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
+@@ -2408,7 +2408,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
  		p.iph.ihl = 5;
  		p.iph.protocol = IPPROTO_IPV6;
  		p.iph.ttl = 64;
@@ -94223,7 +94215,7 @@ index b78a3ee..8f5113c 100644
  
  		if (ops->ndo_do_ioctl) {
  			mm_segment_t oldfs = get_fs();
-@@ -4027,7 +4027,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+@@ -4030,7 +4030,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
  	s_ip_idx = ip_idx = cb->args[2];
  
  	rcu_read_lock();
@@ -94232,7 +94224,7 @@ index b78a3ee..8f5113c 100644
  	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
  		idx = 0;
  		head = &net->dev_index_head[h];
-@@ -4612,7 +4612,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
+@@ -4615,7 +4615,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
  			dst_free(&ifp->rt->dst);
  		break;
  	}
@@ -94241,7 +94233,7 @@ index b78a3ee..8f5113c 100644
  }
  
  static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
-@@ -4632,7 +4632,7 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
+@@ -4635,7 +4635,7 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
  	int *valp = ctl->data;
  	int val = *valp;
  	loff_t pos = *ppos;
@@ -94250,7 +94242,7 @@ index b78a3ee..8f5113c 100644
  	int ret;
  
  	/*
-@@ -4714,7 +4714,7 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write,
+@@ -4717,7 +4717,7 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write,
  	int *valp = ctl->data;
  	int val = *valp;
  	loff_t pos = *ppos;
@@ -94273,7 +94265,7 @@ index 40ffd72..aeac0dc 100644
  
  static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
-index 70e704d..a4293c8 100644
+index 2dee1d9..50585ad 100644
 --- a/net/ipv6/icmp.c
 +++ b/net/ipv6/icmp.c
 @@ -988,7 +988,7 @@ ctl_table ipv6_icmp_table_template[] = {
@@ -94620,7 +94612,7 @@ index 1aeb473..bea761c 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 6c38930..167262c 100644
+index 3fde3e9..2bdf224 100644
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
 @@ -2931,7 +2931,7 @@ ctl_table ipv6_route_table_template[] = {
@@ -96753,7 +96745,7 @@ index 098f1d5f..60da2f7 100644
  
  /* Start T3_rtx timer if it is not already running and update the heartbeat
 diff --git a/net/socket.c b/net/socket.c
-index ac72efc..eac33e5 100644
+index fc90b4f..f12519c 100644
 --- a/net/socket.c
 +++ b/net/socket.c
 @@ -88,6 +88,7 @@
@@ -96924,7 +96916,7 @@ index ac72efc..eac33e5 100644
  	int err, err2;
  	int fput_needed;
  
-@@ -2039,7 +2101,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2043,7 +2105,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
  		 * checking falls down on this.
  		 */
  		if (copy_from_user(ctl_buf,
@@ -96933,7 +96925,7 @@ index ac72efc..eac33e5 100644
  				   ctl_len))
  			goto out_freectl;
  		msg_sys->msg_control = ctl_buf;
-@@ -2190,7 +2252,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2194,7 +2256,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
  	int err, total_len, len;
  
  	/* kernel mode address */
@@ -96942,7 +96934,7 @@ index ac72efc..eac33e5 100644
  
  	/* user mode address pointers */
  	struct sockaddr __user *uaddr;
-@@ -2219,7 +2281,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2223,7 +2285,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
  	/* Save the user-mode address (verify_iovec will change the
  	 * kernel msghdr to use the kernel address space)
  	 */
@@ -96951,7 +96943,7 @@ index ac72efc..eac33e5 100644
  	uaddr_len = COMPAT_NAMELEN(msg);
  	if (MSG_CMSG_COMPAT & flags)
  		err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
-@@ -2975,7 +3037,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
+@@ -2979,7 +3041,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
  		old_fs = get_fs();
  		set_fs(KERNEL_DS);
  		err = dev_ioctl(net, cmd,
@@ -96960,7 +96952,7 @@ index ac72efc..eac33e5 100644
  		set_fs(old_fs);
  
  		return err;
-@@ -3084,7 +3146,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
+@@ -3088,7 +3150,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
  
  	old_fs = get_fs();
  	set_fs(KERNEL_DS);
@@ -96969,7 +96961,7 @@ index ac72efc..eac33e5 100644
  	set_fs(old_fs);
  
  	if (cmd == SIOCGIFMAP && !err) {
-@@ -3189,7 +3251,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
+@@ -3193,7 +3255,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
  		ret |= __get_user(rtdev, &(ur4->rt_dev));
  		if (rtdev) {
  			ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
@@ -96978,7 +96970,7 @@ index ac72efc..eac33e5 100644
  			devname[15] = 0;
  		} else
  			r4.rt_dev = NULL;
-@@ -3415,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
+@@ -3419,8 +3481,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
  	int __user *uoptlen;
  	int err;
  
@@ -96989,7 +96981,7 @@ index ac72efc..eac33e5 100644
  
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
-@@ -3436,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
+@@ -3440,7 +3502,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
  	char __user *uoptval;
  	int err;
  
@@ -97350,7 +97342,7 @@ index 6b42d47..2ac24d5 100644
  
  	sub->evt.event = htohl(event, sub->swap);
 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 94d3347..d0c06b5 100644
+index 75e198d..f4bdcc0 100644
 --- a/net/unix/af_unix.c
 +++ b/net/unix/af_unix.c
 @@ -788,6 +788,12 @@ static struct sock *unix_find_other(struct net *net,
@@ -97399,7 +97391,7 @@ index 94d3347..d0c06b5 100644
  	done_path_create(&path, dentry);
  	return err;
  }
-@@ -2336,9 +2355,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2343,9 +2362,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  		seq_puts(seq, "Num       RefCount Protocol Flags    Type St "
  			 "Inode Path\n");
  	else {
@@ -97414,7 +97406,7 @@ index 94d3347..d0c06b5 100644
  
  		seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
  			s,
-@@ -2365,8 +2388,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2372,8 +2395,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  			}
  			for ( ; i < len; i++)
  				seq_putc(seq, u->addr->name->sun_path[i]);
@@ -97881,10 +97873,10 @@ index 0000000..5e0222d
 +	[[ "$plugincc" =~ "$2" ]] && echo "$2"
 +fi
 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
-index 643764f..6cc0137 100644
+index 5de5660..d3deb89 100644
 --- a/scripts/headers_install.sh
 +++ b/scripts/headers_install.sh
-@@ -29,6 +29,7 @@ do
+@@ -32,6 +32,7 @@ do
  	FILE="$(basename "$i")"
  	sed -r \
  		-e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
@@ -99799,7 +99791,7 @@ index dad36a6..7e5ffbf 100644
  		lock = &avc_cache.slots_lock[hvalue];
  
 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index a7096e1..4671e7b 100644
+index 70d4a8a..444ee12 100644
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
 @@ -97,8 +97,6 @@
@@ -99811,7 +99803,7 @@ index a7096e1..4671e7b 100644
  /* SECMARK reference count */
  static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
  
-@@ -5635,7 +5633,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5653,7 +5651,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
  
  #endif