main/linux-grsec: upgrade to 3.10.33

2 files changed, 67 insertions, 67 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index c60b24a63b..662b14e4fc 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,12 +2,12 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=3.10.32
+pkgver=3.10.33
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=1
+pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -152,8 +152,8 @@ dev() {
 }
 
 md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
-f462ded4115e99d666e0b59b0f4b0f3d  patch-3.10.32.xz
-f6b0288017bd360adcdeade5bc047a21  grsecurity-2.9.1-3.10.32-unofficial.patch
+2a453acf41c3f28122a7cabd3d4acbf5  patch-3.10.33.xz
+2a7c4b66afbcfaaef9d59f45fb34cfd4  grsecurity-2.9.1-3.10.33-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
 cb5c938dccbee36cfb8bb7ee3546b8af  kernelconfig.x86
 daa81b89f18254155ac33c5239abf3a4  kernelconfig.x86_64"
 sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544  linux-3.10.tar.xz
-e05a8b9bbd475a3b85b893b447109aa5a4af3c981d4fb4e500e25e20cae9286a  patch-3.10.32.xz
-fadc080d6a34a6f5819ef044da0acae307b37e8ea949fedf2d551d071bc021ee  grsecurity-2.9.1-3.10.32-unofficial.patch
+4ba2db5d2c54cff38cbbbff940e9a45969ccea675fc1cf78a4e665dd8f97468e  patch-3.10.33.xz
+1b2bc6cfd2fc355790c8c3393cb99068bdd796516a69a54045824984e2ca58b1  grsecurity-2.9.1-3.10.33-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
@@ -180,8 +180,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e  0006-ipv4-use-
 3e6c4101bfb90b6a30173ef81cd0d0bea51d6a995fc045ca67db7fed271d969d  kernelconfig.x86
 da67ef700372d080bffb12a86f0a16c987dc79e18fdfb1a88d2704660239e5f0  kernelconfig.x86_64"
 sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35  linux-3.10.tar.xz
-74d8f3b4930eb4138ecf2c58626667bea9d125d71a3bd7d70f963711f4cec4e2770e27214de02b07e6ae0429f472822462de475954ee603dfbff3f792278c854  patch-3.10.32.xz
-1279bb15b142bc5aabf60c32538184c073d08d76c58f3af29a298999c018a005736e1fff80a3b30183b373de3112c87eb468df4053c0a182f249139fca779b4e  grsecurity-2.9.1-3.10.32-unofficial.patch
+546a27783e1e42ed07701e428a23bf1d3ebaa19f9cdb13197f481a297bfc4fd96b0fed2fc6557c72dbdbd38708cc4573e1d53f56445ab9da9d44edfc9ece88ce  patch-3.10.33.xz
+652639e8b8e45380a8ee021a50deac665aab986a0f2092a1057f24e135a8d1a0f3c48e1f83a502ca051760b1f3e3ab95d16dab95a3b0f93dde6273093ee6b29d  grsecurity-2.9.1-3.10.33-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-grsec/grsecurity-2.9.1-3.10.32-unofficial.patch b/main/linux-grsec/grsecurity-2.9.1-3.10.33-unofficial.patch
index f88bcee193..34ff6783e8 100644
--- a/main/linux-grsec/grsecurity-2.9.1-3.10.32-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.9.1-3.10.33-unofficial.patch
@@ -281,7 +281,7 @@ index 1311a48..f233324 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index aab1924..1ce5370 100644
+index 1e602eb..d847dbc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -1534,7 +1534,7 @@ index 75fe66b..ba3dee4 100644
  
  #endif
 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index 17d0ae8..014e350 100644
+index a25e62d..3d04e3b 100644
 --- a/arch/arm/include/asm/cacheflush.h
 +++ b/arch/arm/include/asm/cacheflush.h
 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
@@ -3495,7 +3495,7 @@ index f6eeb87..cc90868 100644
  };
  
 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
-index 6c4da12..d9ca72d 100644
+index 55bcb77..8fc5ba1 100644
 --- a/arch/arm/mach-omap2/gpmc.c
 +++ b/arch/arm/mach-omap2/gpmc.c
 @@ -147,7 +147,6 @@ struct omap3_gpmc_regs {
@@ -20227,10 +20227,10 @@ index df5e41f..816c719 100644
  extern int generic_get_free_region(unsigned long base, unsigned long size,
  				   int replace_reg);
 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
-index 1025f3c..824f677 100644
+index a69b67d..09545a2 100644
 --- a/arch/x86/kernel/cpu/perf_event.c
 +++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1311,7 +1311,7 @@ static void __init pmu_check_apic(void)
+@@ -1314,7 +1314,7 @@ static void __init pmu_check_apic(void)
  	pr_info("no hardware sampling interrupt available.\n");
  }
  
@@ -20239,7 +20239,7 @@ index 1025f3c..824f677 100644
  	.name = "format",
  	.attrs = NULL,
  };
-@@ -1410,7 +1410,7 @@ static struct attribute *events_attr[] = {
+@@ -1413,7 +1413,7 @@ static struct attribute *events_attr[] = {
  	NULL,
  };
  
@@ -20248,7 +20248,7 @@ index 1025f3c..824f677 100644
  	.name = "events",
  	.attrs = events_attr,
  };
-@@ -1920,7 +1920,7 @@ static unsigned long get_segment_base(unsigned int segment)
+@@ -1923,7 +1923,7 @@ static unsigned long get_segment_base(unsigned int segment)
  		if (idx > GDT_ENTRIES)
  			return 0;
  
@@ -20257,7 +20257,7 @@ index 1025f3c..824f677 100644
  	}
  
  	return get_desc_base(desc + idx);
-@@ -2010,7 +2010,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -2013,7 +2013,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
  			break;
  
  		perf_callchain_store(entry, frame.return_address);
@@ -27065,7 +27065,7 @@ index 5402c94..c3bdeee 100644
  
  	vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 1bd6ea0..9a0ca37 100644
+index 1be0a9e..b661403 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
 @@ -1728,8 +1728,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
@@ -42000,7 +42000,7 @@ index bd88d3da..b754a8b 100644
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
-index 33ac3be..8ff3a57 100644
+index 5f49d70..4321ba6 100644
 --- a/drivers/md/dm-thin-metadata.c
 +++ b/drivers/md/dm-thin-metadata.c
 @@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
@@ -52587,7 +52587,7 @@ index ebd06fd..41c850d 100644
  	kiocb->ki_nbytes = ret;
  	return 0;
 diff --git a/fs/attr.c b/fs/attr.c
-index 1449adb..a2038c2 100644
+index 8dd5825..a90e189 100644
 --- a/fs/attr.c
 +++ b/fs/attr.c
 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
@@ -54415,10 +54415,10 @@ index 4885a40..41ada38 100644
  }
  
 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
-index f2e76f3..c44fac7 100644
+index e2756bb..2f79087 100644
 --- a/fs/cifs/smb2ops.c
 +++ b/fs/cifs/smb2ops.c
-@@ -274,8 +274,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
+@@ -268,8 +268,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
  #ifdef CONFIG_CIFS_STATS
  	int i;
  	for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
@@ -54429,7 +54429,7 @@ index f2e76f3..c44fac7 100644
  	}
  #endif
  }
-@@ -284,66 +284,66 @@ static void
+@@ -278,66 +278,66 @@ static void
  smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
  {
  #ifdef CONFIG_CIFS_STATS
@@ -54537,10 +54537,10 @@ index f2e76f3..c44fac7 100644
  }
  
 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
-index 2b95ce2..d079d75 100644
+index c7a6fd8..f688ab6 100644
 --- a/fs/cifs/smb2pdu.c
 +++ b/fs/cifs/smb2pdu.c
-@@ -1760,8 +1760,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
+@@ -1763,8 +1763,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
  	default:
  		cifs_dbg(VFS, "info level %u isn't supported\n",
  			 srch_inf->info_level);
@@ -55818,10 +55818,10 @@ index 3742e4c..69a797f 100644
  		if (free_clusters >= (nclusters + dirty_clusters +
  				      resv_clusters))
 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 7bb2e2e..7742269 100644
+index 790b14c..aa99bcb 100644
 --- a/fs/ext4/ext4.h
 +++ b/fs/ext4/ext4.h
-@@ -1262,19 +1262,19 @@ struct ext4_sb_info {
+@@ -1264,19 +1264,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
  	/* stats for buddy allocator */
@@ -55982,7 +55982,7 @@ index 214461e..3614c89 100644
  		       "MMP failure info: last update time: %llu, last update "
  		       "node: %s, last update device: %s\n",
 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index 49d3c01..9579efd 100644
+index c503850..c7df90a 100644
 --- a/fs/ext4/resize.c
 +++ b/fs/ext4/resize.c
 @@ -79,12 +79,20 @@ static int verify_group_input(struct super_block *sb,
@@ -56021,7 +56021,7 @@ index 49d3c01..9579efd 100644
  	else if (input->reserved_blocks > input->blocks_count / 5)
  		ext4_warning(sb, "Reserved blocks too high (%u)",
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index e4923b6..bb73620 100644
+index a7a5f7e..f75ff92 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
 @@ -1236,7 +1236,7 @@ static ext4_fsblk_t get_sb_block(void **data)
@@ -76312,7 +76312,7 @@ index 65545ac..7335a0c 100644
  struct iovec;
  struct kvec;
 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index abf7756..13c93cb 100644
+index 4d2e041..4600d43 100644
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
 @@ -1026,6 +1026,7 @@ struct net_device_ops {
@@ -77248,7 +77248,7 @@ index 2ac423b..237c72e 100644
  #define save_altstack_ex(uss, sp) do { \
  	stack_t __user *__uss = uss; \
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index ded45ec..675c1f6 100644
+index 478120a..2f307f7 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 @@ -631,7 +631,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
@@ -77305,7 +77305,7 @@ index ded45ec..675c1f6 100644
  					       int offset, struct iovec *to,
  					       int size);
  extern int	       skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
-@@ -2718,6 +2718,9 @@ static inline void nf_reset(struct sk_buff *skb)
+@@ -2720,6 +2720,9 @@ static inline void nf_reset(struct sk_buff *skb)
  	nf_bridge_put(skb->nf_bridge);
  	skb->nf_bridge = NULL;
  #endif
@@ -80040,10 +80040,10 @@ index b0e99de..09f385c 100644
  	int oldval;
  	int rc;
 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
-index 383d638..943fdbb 100644
+index 5bb8bfe..e058545 100644
 --- a/ipc/mq_sysctl.c
 +++ b/ipc/mq_sysctl.c
-@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
+@@ -35,7 +35,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,
  static int proc_mq_dointvec_minmax(ctl_table *table, int write,
  	void __user *buffer, size_t *lenp, loff_t *ppos)
  {
@@ -80053,7 +80053,7 @@ index 383d638..943fdbb 100644
  	mq_table.data = get_mq(table);
  
 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
-index ae1996d..a35f2cc 100644
+index bb0248f..930acfc 100644
 --- a/ipc/mqueue.c
 +++ b/ipc/mqueue.c
 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
@@ -80822,7 +80822,7 @@ index 00eb8f7..d7e3244 100644
  #ifdef CONFIG_MODULE_UNLOAD
  		{
 diff --git a/kernel/events/core.c b/kernel/events/core.c
-index e76e495..cbfe63a 100644
+index f8eb2b1..176b138 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
 @@ -156,8 +156,15 @@ static struct srcu_struct pmus_srcu;
@@ -85972,10 +85972,10 @@ index 05039e3..17490c7 100644
  	.thread_should_run	= watchdog_should_run,
  	.thread_fn		= watchdog,
 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 68086a3..729fa07 100644
+index db7a6ac..ef44b59 100644
 --- a/kernel/workqueue.c
 +++ b/kernel/workqueue.c
-@@ -4615,7 +4615,7 @@ static void rebind_workers(struct worker_pool *pool)
+@@ -4622,7 +4622,7 @@ static void rebind_workers(struct worker_pool *pool)
  		WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
  		worker_flags |= WORKER_REBOUND;
  		worker_flags &= ~WORKER_UNBOUND;
@@ -92202,10 +92202,10 @@ index 0f45522..dab651f 100644
  			list_del(&p->list);
  			goto out;
 diff --git a/net/can/af_can.c b/net/can/af_can.c
-index c4e5085..aa9efdf 100644
+index f59859a..22d4ed3 100644
 --- a/net/can/af_can.c
 +++ b/net/can/af_can.c
-@@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
+@@ -863,7 +863,7 @@ static const struct net_proto_family can_family_ops = {
  };
  
  /* notifier block for netdevice event */
@@ -92421,7 +92421,7 @@ index b71423d..0360434 100644
  
  	return err;
 diff --git a/net/core/dev.c b/net/core/dev.c
-index 1283c84..60f0253 100644
+index a0e55ff..632b045 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
 @@ -1649,7 +1649,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
@@ -92442,7 +92442,7 @@ index 1283c84..60f0253 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -2404,7 +2404,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
+@@ -2404,7 +2404,7 @@ static int illegal_highdma(const struct net_device *dev, struct sk_buff *skb)
  
  struct dev_gso_cb {
  	void (*destructor)(struct sk_buff *skb);
@@ -92451,7 +92451,7 @@ index 1283c84..60f0253 100644
  
  #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
  
-@@ -3139,7 +3139,7 @@ enqueue:
+@@ -3144,7 +3144,7 @@ enqueue:
  
  	local_irq_restore(flags);
  
@@ -92460,7 +92460,7 @@ index 1283c84..60f0253 100644
  	kfree_skb(skb);
  	return NET_RX_DROP;
  }
-@@ -3211,7 +3211,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3216,7 +3216,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -92469,7 +92469,7 @@ index 1283c84..60f0253 100644
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -3545,7 +3545,7 @@ ncls:
+@@ -3550,7 +3550,7 @@ ncls:
  			ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
  	} else {
  drop:
@@ -92478,7 +92478,7 @@ index 1283c84..60f0253 100644
  		kfree_skb(skb);
  		/* Jamal, now you will not able to escape explaining
  		 * me how you were going to use this. :-)
-@@ -4153,7 +4153,7 @@ void netif_napi_del(struct napi_struct *napi)
+@@ -4158,7 +4158,7 @@ void netif_napi_del(struct napi_struct *napi)
  }
  EXPORT_SYMBOL(netif_napi_del);
  
@@ -92487,7 +92487,7 @@ index 1283c84..60f0253 100644
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-@@ -5590,7 +5590,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+@@ -5595,7 +5595,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
  	} else {
  		netdev_stats_to_stats64(storage, &dev->stats);
  	}
@@ -92703,7 +92703,7 @@ index f9765203..9feaef8 100644
  	return error;
  }
 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index 27f33f2..04f7985 100644
+index 433a105..8f0dd0e 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)
@@ -92804,10 +92804,10 @@ index b4da80b..98d6bdb 100644
  	{
  		struct socket *sock;
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 20ee14d..9e09ed8 100644
+index 79143b7..4329760 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -3055,13 +3055,15 @@ void __init skb_init(void)
+@@ -3057,13 +3057,15 @@ void __init skb_init(void)
  	skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
  					      sizeof(struct sk_buff),
  					      0,
@@ -92826,7 +92826,7 @@ index 20ee14d..9e09ed8 100644
  }
  
 diff --git a/net/core/sock.c b/net/core/sock.c
-index 50a345e..40b04b1 100644
+index 3ba5270..4036f92 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)
@@ -93079,7 +93079,7 @@ index a55eecc..dd8428c 100644
  
  	*lenp = len;
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
-index 31b127e..627fdea 100644
+index ca118e8..9d06b37 100644
 --- a/net/ieee802154/6lowpan.c
 +++ b/net/ieee802154/6lowpan.c
 @@ -459,7 +459,7 @@ static int lowpan_header_create(struct sk_buff *skb,
@@ -93133,10 +93133,10 @@ index 2e7f194..0fa4d6d 100644
  
  		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);
 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index 9e38217..0d4fa52 100644
+index e40eef4..5d860f7 100644
 --- a/net/ipv4/devinet.c
 +++ b/net/ipv4/devinet.c
-@@ -1531,7 +1531,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
+@@ -1532,7 +1532,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -93145,7 +93145,7 @@ index 9e38217..0d4fa52 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -1842,7 +1842,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
+@@ -1843,7 +1843,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -93154,7 +93154,7 @@ index 9e38217..0d4fa52 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -2067,7 +2067,7 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write,
+@@ -2068,7 +2068,7 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write,
  #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
  	DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
  
@@ -93163,7 +93163,7 @@ index 9e38217..0d4fa52 100644
  	struct ctl_table_header *sysctl_header;
  	struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
  } devinet_sysctl = {
-@@ -2185,7 +2185,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2186,7 +2186,7 @@ static __net_init int devinet_init_net(struct net *net)
  	int err;
  	struct ipv4_devconf *all, *dflt;
  #ifdef CONFIG_SYSCTL
@@ -93172,7 +93172,7 @@ index 9e38217..0d4fa52 100644
  	struct ctl_table_header *forw_hdr;
  #endif
  
-@@ -2203,7 +2203,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2204,7 +2204,7 @@ static __net_init int devinet_init_net(struct net *net)
  			goto err_alloc_dflt;
  
  #ifdef CONFIG_SYSCTL
@@ -93181,7 +93181,7 @@ index 9e38217..0d4fa52 100644
  		if (tbl == NULL)
  			goto err_alloc_ctl;
  
-@@ -2223,7 +2223,10 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2224,7 +2224,10 @@ static __net_init int devinet_init_net(struct net *net)
  		goto err_reg_dflt;
  
  	err = -ENOMEM;
@@ -93193,7 +93193,7 @@ index 9e38217..0d4fa52 100644
  	if (forw_hdr == NULL)
  		goto err_reg_ctl;
  	net->ipv4.forw_hdr = forw_hdr;
-@@ -2239,8 +2242,7 @@ err_reg_ctl:
+@@ -2240,8 +2243,7 @@ err_reg_ctl:
  err_reg_dflt:
  	__devinet_sysctl_unregister(all);
  err_reg_all:
@@ -93683,7 +93683,7 @@ index 402870f..4651346 100644
  
  static int raw_seq_show(struct seq_file *seq, void *v)
 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index f6c6ab1..e0dae89 100644
+index 1a362f3..6b619fe 100644
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
 @@ -2562,34 +2562,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
@@ -96657,10 +96657,10 @@ index 8aab894..f6b7e7d 100644
  	sctp_generate_t1_cookie_event,
  	sctp_generate_t1_init_event,
 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 79bc251..4530ee0 100644
+index 8554e5e..b9ca30b 100644
 --- a/net/sctp/socket.c
 +++ b/net/sctp/socket.c
-@@ -2170,11 +2170,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
+@@ -2193,11 +2193,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
  {
  	struct sctp_association *asoc;
  	struct sctp_ulpevent *event;
@@ -96675,7 +96675,7 @@ index 79bc251..4530ee0 100644
  
  	/*
  	 * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
-@@ -4225,13 +4227,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
+@@ -4248,13 +4250,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
  static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
  				  int __user *optlen)
  {
@@ -96693,7 +96693,7 @@ index 79bc251..4530ee0 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -4249,6 +4254,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
+@@ -4272,6 +4277,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
   */
  static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
  {
@@ -96702,7 +96702,7 @@ index 79bc251..4530ee0 100644
  	/* Applicable to UDP-style socket only */
  	if (sctp_style(sk, TCP))
  		return -EOPNOTSUPP;
-@@ -4257,7 +4264,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
+@@ -4280,7 +4287,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
  	len = sizeof(int);
  	if (put_user(len, optlen))
  		return -EFAULT;
@@ -96712,7 +96712,7 @@ index 79bc251..4530ee0 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -4629,12 +4637,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
+@@ -4652,12 +4660,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
   */
  static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
  {
@@ -96729,7 +96729,7 @@ index 79bc251..4530ee0 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -4675,6 +4686,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+@@ -4698,6 +4709,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
  		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
  		if (space_left < addrlen)
  			return -ENOMEM;