aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-12-09 08:18:09 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-12-09 08:18:09 +0000
commit1350933a3c7a051b80c3a6e611b587f51bef99bf (patch)
tree6a47e602b3775bfa961d92de2e05904356410527
parent3aad4d14d4b8b62bf4f5c1316b7be8938b778611 (diff)
downloadalpine_aports-1350933a3c7a051b80c3a6e611b587f51bef99bf.tar.bz2
alpine_aports-1350933a3c7a051b80c3a6e611b587f51bef99bf.tar.xz
alpine_aports-1350933a3c7a051b80c3a6e611b587f51bef99bf.zip
main/linux-grsec: upgrade to 3.10.23
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD14
-rw-r--r--main/linux-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch (renamed from main/linux-grsec/grsecurity-2.9.1-3.10.22-unofficial.patch)294
2 files changed, 154 insertions, 154 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 1a5f127e4a..b08548eb88 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
2 2
3_flavor=grsec 3_flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=3.10.22 5pkgver=3.10.23
6case $pkgver in 6case $pkgver in
7*.*.*) _kernver=${pkgver%.*};; 7*.*.*) _kernver=${pkgver%.*};;
8*.*) _kernver=${pkgver};; 8*.*) _kernver=${pkgver};;
@@ -151,8 +151,8 @@ dev() {
151} 151}
152 152
153md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz 153md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz
154a618186bdb6f5b38dc831875b0d3a1cb patch-3.10.22.xz 1548b9650e10f8beee769545b51202766a5 patch-3.10.23.xz
15586c74e12d4219d397d8fdb3e59dbab30 grsecurity-2.9.1-3.10.22-unofficial.patch 15582efe899230f7246ca99f3d334c0c1b8 grsecurity-2.9.1-3.10.23-unofficial.patch
156a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch 156a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
157656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch 157656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
158aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch 158aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -164,8 +164,8 @@ b3c0153d53e508e03d73b94d15b24a96 sysctl_lxc.patch
164cb5c938dccbee36cfb8bb7ee3546b8af kernelconfig.x86 164cb5c938dccbee36cfb8bb7ee3546b8af kernelconfig.x86
165daa81b89f18254155ac33c5239abf3a4 kernelconfig.x86_64" 165daa81b89f18254155ac33c5239abf3a4 kernelconfig.x86_64"
166sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz 166sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz
1679c889789a1ed733d97c7e34ca67c8c4c3afd69791a4219f842ef7913b24c9115 patch-3.10.22.xz 167bdf3983ff3e26c5781edb19a8d0d7765e2e0282cfabda2b0652cc0deff53f445 patch-3.10.23.xz
168cc3d9d1dd9976e2df2278eb8a656026916b35f05e5b1f042d212ce89d9841c1a grsecurity-2.9.1-3.10.22-unofficial.patch 168f0dfa654e64e79c96127a0f8cd4867a0170f099c7116e7f45e27572294b1b818 grsecurity-2.9.1-3.10.23-unofficial.patch
1696af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch 1696af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
170dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch 170dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
1710985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch 1710985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -177,8 +177,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e 0006-ipv4-use-
1773e6c4101bfb90b6a30173ef81cd0d0bea51d6a995fc045ca67db7fed271d969d kernelconfig.x86 1773e6c4101bfb90b6a30173ef81cd0d0bea51d6a995fc045ca67db7fed271d969d kernelconfig.x86
178da67ef700372d080bffb12a86f0a16c987dc79e18fdfb1a88d2704660239e5f0 kernelconfig.x86_64" 178da67ef700372d080bffb12a86f0a16c987dc79e18fdfb1a88d2704660239e5f0 kernelconfig.x86_64"
179sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz 179sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz
180bb62ecf2467aa7543b191ea3e7749fa37f5bddefc5726e6ca7ff4ce1c98e2bb88effbd52af5ea6e42b638d54b1b845fe0b62150866c100a9773dd3d81c9cee8d patch-3.10.22.xz 1800fdb65f1c45e490e1f2206589273e4b8f0f142ab6b16341cb52977e0c6a983b359f01456a9cae3e1c139d5ead5de106c10909b7fdb6a156675cad5d39374e97f patch-3.10.23.xz
18133daf2b324ecaa55dcabc35a48f1bfc0966aa55b5ffecbacd198c006dcf93aaa91fa1fe46451e562c15a380cc12cccb84d4b426ecc799556cd48bea12a2eab73 grsecurity-2.9.1-3.10.22-unofficial.patch 1818905d7215d9f82662e0e7b897fc2fb258c5978d12fed9cf618e60c7b0926af2f76e3b242140e9d3ab4988cee684f350aaf26270d1a8518297cde9928361d146d grsecurity-2.9.1-3.10.23-unofficial.patch
18281e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch 18281e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
18351ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch 18351ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
18457d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch 18457d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.10.22-unofficial.patch b/main/linux-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch
index 4550f0d673..cc4eeaf731 100644
--- a/main/linux-grsec/grsecurity-2.9.1-3.10.22-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch
@@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644
281 281
282 pcd. [PARIDE] 282 pcd. [PARIDE]
283diff --git a/Makefile b/Makefile 283diff --git a/Makefile b/Makefile
284index 001188c..5f48732 100644 284index c6d2ec5..b2bfe62 100644
285--- a/Makefile 285--- a/Makefile
286+++ b/Makefile 286+++ b/Makefile
287@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 287@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -35596,7 +35596,7 @@ index 1dc0519..1aadaf7 100644
35596 // free the skb 35596 // free the skb
35597 hrz_kfree_skb (skb); 35597 hrz_kfree_skb (skb);
35598diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c 35598diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
35599index 272f009..a18ba55 100644 35599index 1bdf104..9dc44b1 100644
35600--- a/drivers/atm/idt77252.c 35600--- a/drivers/atm/idt77252.c
35601+++ b/drivers/atm/idt77252.c 35601+++ b/drivers/atm/idt77252.c
35602@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc) 35602@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
@@ -43955,7 +43955,7 @@ index d3f8797..82a03d3 100644
43955 vlan_req = (struct qlcnic_vlan_req *)&req->words[1]; 43955 vlan_req = (struct qlcnic_vlan_req *)&req->words[1];
43956 vlan_req->vlan_id = cpu_to_le16(vlan_id); 43956 vlan_req->vlan_id = cpu_to_le16(vlan_id);
43957diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c 43957diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
43958index 7199d2a..0cae710 100644 43958index e9b5d77a..1898ba7 100644
43959--- a/drivers/net/ethernet/realtek/r8169.c 43959--- a/drivers/net/ethernet/realtek/r8169.c
43960+++ b/drivers/net/ethernet/realtek/r8169.c 43960+++ b/drivers/net/ethernet/realtek/r8169.c
43961@@ -753,22 +753,22 @@ struct rtl8169_private { 43961@@ -753,22 +753,22 @@ struct rtl8169_private {
@@ -44098,10 +44098,10 @@ index 06eba6e..a06bf31 100644
44098 }; 44098 };
44099 44099
44100diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c 44100diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
44101index 523d6b2..5e16aa1 100644 44101index c70ff7d..10fcffc 100644
44102--- a/drivers/net/macvtap.c 44102--- a/drivers/net/macvtap.c
44103+++ b/drivers/net/macvtap.c 44103+++ b/drivers/net/macvtap.c
44104@@ -1110,7 +1110,7 @@ static int macvtap_device_event(struct notifier_block *unused, 44104@@ -1116,7 +1116,7 @@ static int macvtap_device_event(struct notifier_block *unused,
44105 return NOTIFY_DONE; 44105 return NOTIFY_DONE;
44106 } 44106 }
44107 44107
@@ -44158,10 +44158,10 @@ index 1252d9c..80e660b 100644
44158 44158
44159 /* We've got a compressed packet; read the change byte */ 44159 /* We've got a compressed packet; read the change byte */
44160diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c 44160diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
44161index b305105..8ead6df 100644 44161index fe3fd77..b048392 100644
44162--- a/drivers/net/team/team.c 44162--- a/drivers/net/team/team.c
44163+++ b/drivers/net/team/team.c 44163+++ b/drivers/net/team/team.c
44164@@ -2682,7 +2682,7 @@ static int team_device_event(struct notifier_block *unused, 44164@@ -2686,7 +2686,7 @@ static int team_device_event(struct notifier_block *unused,
44165 return NOTIFY_DONE; 44165 return NOTIFY_DONE;
44166 } 44166 }
44167 44167
@@ -44171,10 +44171,10 @@ index b305105..8ead6df 100644
44171 }; 44171 };
44172 44172
44173diff --git a/drivers/net/tun.c b/drivers/net/tun.c 44173diff --git a/drivers/net/tun.c b/drivers/net/tun.c
44174index b18ead5..109dcbd 100644 44174index 9ef85fe..64e88b0 100644
44175--- a/drivers/net/tun.c 44175--- a/drivers/net/tun.c
44176+++ b/drivers/net/tun.c 44176+++ b/drivers/net/tun.c
44177@@ -1876,7 +1876,7 @@ unlock: 44177@@ -1884,7 +1884,7 @@ unlock:
44178 } 44178 }
44179 44179
44180 static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 44180 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
@@ -44183,7 +44183,7 @@ index b18ead5..109dcbd 100644
44183 { 44183 {
44184 struct tun_file *tfile = file->private_data; 44184 struct tun_file *tfile = file->private_data;
44185 struct tun_struct *tun; 44185 struct tun_struct *tun;
44186@@ -1888,6 +1888,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 44186@@ -1896,6 +1896,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44187 int vnet_hdr_sz; 44187 int vnet_hdr_sz;
44188 int ret; 44188 int ret;
44189 44189
@@ -52555,7 +52555,7 @@ index 789bc25..fafaeea 100644
52555 &data); 52555 &data);
52556 if (!inode) { 52556 if (!inode) {
52557diff --git a/fs/aio.c b/fs/aio.c 52557diff --git a/fs/aio.c b/fs/aio.c
52558index 2bbcacf..8614116 100644 52558index ebd06fd..41c850d 100644
52559--- a/fs/aio.c 52559--- a/fs/aio.c
52560+++ b/fs/aio.c 52560+++ b/fs/aio.c
52561@@ -160,7 +160,7 @@ static int aio_setup_ring(struct kioctx *ctx) 52561@@ -160,7 +160,7 @@ static int aio_setup_ring(struct kioctx *ctx)
@@ -52567,7 +52567,7 @@ index 2bbcacf..8614116 100644
52567 return -EINVAL; 52567 return -EINVAL;
52568 52568
52569 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 52569 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
52570@@ -950,6 +950,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) 52570@@ -952,6 +952,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op)
52571 static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) 52571 static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat)
52572 { 52572 {
52573 ssize_t ret; 52573 ssize_t ret;
@@ -52575,7 +52575,7 @@ index 2bbcacf..8614116 100644
52575 52575
52576 kiocb->ki_nr_segs = kiocb->ki_nbytes; 52576 kiocb->ki_nr_segs = kiocb->ki_nbytes;
52577 52577
52578@@ -957,17 +958,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) 52578@@ -959,17 +960,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat)
52579 if (compat) 52579 if (compat)
52580 ret = compat_rw_copy_check_uvector(rw, 52580 ret = compat_rw_copy_check_uvector(rw,
52581 (struct compat_iovec __user *)kiocb->ki_buf, 52581 (struct compat_iovec __user *)kiocb->ki_buf,
@@ -61814,7 +61814,7 @@ index 6157424..ac98f6d 100644
61814 *offset = off & 0x7fffffff; 61814 *offset = off & 0x7fffffff;
61815 return 0; 61815 return 0;
61816diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c 61816diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
61817index 5e99968..45bd327 100644 61817index ca01d83..86b14a7 100644
61818--- a/fs/xfs/xfs_ioctl.c 61818--- a/fs/xfs/xfs_ioctl.c
61819+++ b/fs/xfs/xfs_ioctl.c 61819+++ b/fs/xfs/xfs_ioctl.c
61820@@ -127,7 +127,7 @@ xfs_find_handle( 61820@@ -127,7 +127,7 @@ xfs_find_handle(
@@ -76319,10 +76319,10 @@ index 5a5ff57..5ae5070 100644
76319 return nd->saved_names[nd->depth]; 76319 return nd->saved_names[nd->depth];
76320 } 76320 }
76321diff --git a/include/linux/net.h b/include/linux/net.h 76321diff --git a/include/linux/net.h b/include/linux/net.h
76322index 99c9f0c..e1cf296 100644 76322index 0c4ae5d..87874be 100644
76323--- a/include/linux/net.h 76323--- a/include/linux/net.h
76324+++ b/include/linux/net.h 76324+++ b/include/linux/net.h
76325@@ -183,7 +183,7 @@ struct net_proto_family { 76325@@ -191,7 +191,7 @@ struct net_proto_family {
76326 int (*create)(struct net *net, struct socket *sock, 76326 int (*create)(struct net *net, struct socket *sock,
76327 int protocol, int kern); 76327 int protocol, int kern);
76328 struct module *owner; 76328 struct module *owner;
@@ -76783,7 +76783,7 @@ index 34a1e10..03a6d03 100644
76783 struct proc_ns { 76783 struct proc_ns {
76784 void *ns; 76784 void *ns;
76785diff --git a/include/linux/random.h b/include/linux/random.h 76785diff --git a/include/linux/random.h b/include/linux/random.h
76786index 6312dd9..f67904d 100644 76786index bf9085e..57fbf6c 100644
76787--- a/include/linux/random.h 76787--- a/include/linux/random.h
76788+++ b/include/linux/random.h 76788+++ b/include/linux/random.h
76789@@ -33,6 +33,11 @@ void prandom_seed(u32 seed); 76789@@ -33,6 +33,11 @@ void prandom_seed(u32 seed);
@@ -77268,10 +77268,10 @@ index 2ac423b..237c72e 100644
77268 #define save_altstack_ex(uss, sp) do { \ 77268 #define save_altstack_ex(uss, sp) do { \
77269 stack_t __user *__uss = uss; \ 77269 stack_t __user *__uss = uss; \
77270diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h 77270diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
77271index eaf6027..2266947 100644 77271index 74db47e..c42c51d 100644
77272--- a/include/linux/skbuff.h 77272--- a/include/linux/skbuff.h
77273+++ b/include/linux/skbuff.h 77273+++ b/include/linux/skbuff.h
77274@@ -640,7 +640,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, 77274@@ -631,7 +631,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
77275 extern struct sk_buff *__alloc_skb(unsigned int size, 77275 extern struct sk_buff *__alloc_skb(unsigned int size,
77276 gfp_t priority, int flags, int node); 77276 gfp_t priority, int flags, int node);
77277 extern struct sk_buff *build_skb(void *data, unsigned int frag_size); 77277 extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
@@ -77280,7 +77280,7 @@ index eaf6027..2266947 100644
77280 gfp_t priority) 77280 gfp_t priority)
77281 { 77281 {
77282 return __alloc_skb(size, priority, 0, NUMA_NO_NODE); 77282 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
77283@@ -756,7 +756,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb) 77283@@ -747,7 +747,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
77284 */ 77284 */
77285 static inline int skb_queue_empty(const struct sk_buff_head *list) 77285 static inline int skb_queue_empty(const struct sk_buff_head *list)
77286 { 77286 {
@@ -77289,7 +77289,7 @@ index eaf6027..2266947 100644
77289 } 77289 }
77290 77290
77291 /** 77291 /**
77292@@ -769,7 +769,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list) 77292@@ -760,7 +760,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
77293 static inline bool skb_queue_is_last(const struct sk_buff_head *list, 77293 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
77294 const struct sk_buff *skb) 77294 const struct sk_buff *skb)
77295 { 77295 {
@@ -77298,7 +77298,7 @@ index eaf6027..2266947 100644
77298 } 77298 }
77299 77299
77300 /** 77300 /**
77301@@ -782,7 +782,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list, 77301@@ -773,7 +773,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
77302 static inline bool skb_queue_is_first(const struct sk_buff_head *list, 77302 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
77303 const struct sk_buff *skb) 77303 const struct sk_buff *skb)
77304 { 77304 {
@@ -77307,7 +77307,7 @@ index eaf6027..2266947 100644
77307 } 77307 }
77308 77308
77309 /** 77309 /**
77310@@ -1853,7 +1853,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) 77310@@ -1844,7 +1844,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
77311 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) 77311 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
77312 */ 77312 */
77313 #ifndef NET_SKB_PAD 77313 #ifndef NET_SKB_PAD
@@ -77316,7 +77316,7 @@ index eaf6027..2266947 100644
77316 #endif 77316 #endif
77317 77317
77318 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); 77318 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
77319@@ -2448,7 +2448,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, 77319@@ -2439,7 +2439,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
77320 int noblock, int *err); 77320 int noblock, int *err);
77321 extern unsigned int datagram_poll(struct file *file, struct socket *sock, 77321 extern unsigned int datagram_poll(struct file *file, struct socket *sock,
77322 struct poll_table_struct *wait); 77322 struct poll_table_struct *wait);
@@ -77325,7 +77325,7 @@ index eaf6027..2266947 100644
77325 int offset, struct iovec *to, 77325 int offset, struct iovec *to,
77326 int size); 77326 int size);
77327 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, 77327 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
77328@@ -2738,6 +2738,9 @@ static inline void nf_reset(struct sk_buff *skb) 77328@@ -2713,6 +2713,9 @@ static inline void nf_reset(struct sk_buff *skb)
77329 nf_bridge_put(skb->nf_bridge); 77329 nf_bridge_put(skb->nf_bridge);
77330 skb->nf_bridge = NULL; 77330 skb->nf_bridge = NULL;
77331 #endif 77331 #endif
@@ -78482,7 +78482,7 @@ index 53f464d..0bd0b49 100644
78482 78482
78483 #endif /* _NET_INETPEER_H */ 78483 #endif /* _NET_INETPEER_H */
78484diff --git a/include/net/ip.h b/include/net/ip.h 78484diff --git a/include/net/ip.h b/include/net/ip.h
78485index edfa591..a643b82 100644 78485index 788f1d8..64d3e27 100644
78486--- a/include/net/ip.h 78486--- a/include/net/ip.h
78487+++ b/include/net/ip.h 78487+++ b/include/net/ip.h
78488@@ -202,7 +202,7 @@ extern struct local_ports { 78488@@ -202,7 +202,7 @@ extern struct local_ports {
@@ -78508,10 +78508,10 @@ index e49db91..76a81de 100644
78508 fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) 78508 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
78509 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw) 78509 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
78510diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h 78510diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
78511index 4c062cc..3562c31 100644 78511index f0c13a3..f41f6d86 100644
78512--- a/include/net/ip_vs.h 78512--- a/include/net/ip_vs.h
78513+++ b/include/net/ip_vs.h 78513+++ b/include/net/ip_vs.h
78514@@ -612,7 +612,7 @@ struct ip_vs_conn { 78514@@ -582,7 +582,7 @@ struct ip_vs_conn {
78515 struct ip_vs_conn *control; /* Master control connection */ 78515 struct ip_vs_conn *control; /* Master control connection */
78516 atomic_t n_control; /* Number of controlled ones */ 78516 atomic_t n_control; /* Number of controlled ones */
78517 struct ip_vs_dest *dest; /* real server */ 78517 struct ip_vs_dest *dest; /* real server */
@@ -78520,7 +78520,7 @@ index 4c062cc..3562c31 100644
78520 78520
78521 /* packet transmitter for different forwarding methods. If it 78521 /* packet transmitter for different forwarding methods. If it
78522 mangles the packet, it must return NF_DROP or better NF_STOLEN, 78522 mangles the packet, it must return NF_DROP or better NF_STOLEN,
78523@@ -761,7 +761,7 @@ struct ip_vs_dest { 78523@@ -731,7 +731,7 @@ struct ip_vs_dest {
78524 __be16 port; /* port number of the server */ 78524 __be16 port; /* port number of the server */
78525 union nf_inet_addr addr; /* IP address of the server */ 78525 union nf_inet_addr addr; /* IP address of the server */
78526 volatile unsigned int flags; /* dest status flags */ 78526 volatile unsigned int flags; /* dest status flags */
@@ -78529,7 +78529,7 @@ index 4c062cc..3562c31 100644
78529 atomic_t weight; /* server weight */ 78529 atomic_t weight; /* server weight */
78530 78530
78531 atomic_t refcnt; /* reference counter */ 78531 atomic_t refcnt; /* reference counter */
78532@@ -1013,11 +1013,11 @@ struct netns_ipvs { 78532@@ -983,11 +983,11 @@ struct netns_ipvs {
78533 /* ip_vs_lblc */ 78533 /* ip_vs_lblc */
78534 int sysctl_lblc_expiration; 78534 int sysctl_lblc_expiration;
78535 struct ctl_table_header *lblc_ctl_header; 78535 struct ctl_table_header *lblc_ctl_header;
@@ -89371,7 +89371,7 @@ index 8f87b14..5748b4e 100644
89371 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 89371 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
89372 89372
89373diff --git a/mm/mprotect.c b/mm/mprotect.c 89373diff --git a/mm/mprotect.c b/mm/mprotect.c
89374index 2bbb648..1658c46 100644 89374index d4d5399..48cbd4a 100644
89375--- a/mm/mprotect.c 89375--- a/mm/mprotect.c
89376+++ b/mm/mprotect.c 89376+++ b/mm/mprotect.c
89377@@ -23,10 +23,18 @@ 89377@@ -23,10 +23,18 @@
@@ -89393,7 +89393,7 @@ index 2bbb648..1658c46 100644
89393 89393
89394 #ifndef pgprot_modify 89394 #ifndef pgprot_modify
89395 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) 89395 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
89396@@ -233,6 +241,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start, 89396@@ -238,6 +246,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
89397 return pages; 89397 return pages;
89398 } 89398 }
89399 89399
@@ -89442,7 +89442,7 @@ index 2bbb648..1658c46 100644
89442 int 89442 int
89443 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, 89443 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
89444 unsigned long start, unsigned long end, unsigned long newflags) 89444 unsigned long start, unsigned long end, unsigned long newflags)
89445@@ -245,11 +295,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, 89445@@ -250,11 +300,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
89446 int error; 89446 int error;
89447 int dirty_accountable = 0; 89447 int dirty_accountable = 0;
89448 89448
@@ -89472,7 +89472,7 @@ index 2bbb648..1658c46 100644
89472 /* 89472 /*
89473 * If we make a private mapping writable we increase our commit; 89473 * If we make a private mapping writable we increase our commit;
89474 * but (without finer accounting) cannot reduce our commit if we 89474 * but (without finer accounting) cannot reduce our commit if we
89475@@ -266,6 +334,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, 89475@@ -271,6 +339,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
89476 } 89476 }
89477 } 89477 }
89478 89478
@@ -89515,7 +89515,7 @@ index 2bbb648..1658c46 100644
89515 /* 89515 /*
89516 * First try to merge with previous and/or next vma. 89516 * First try to merge with previous and/or next vma.
89517 */ 89517 */
89518@@ -296,9 +400,21 @@ success: 89518@@ -301,9 +405,21 @@ success:
89519 * vm_flags and vm_page_prot are protected by the mmap_sem 89519 * vm_flags and vm_page_prot are protected by the mmap_sem
89520 * held in write mode. 89520 * held in write mode.
89521 */ 89521 */
@@ -89538,7 +89538,7 @@ index 2bbb648..1658c46 100644
89538 89538
89539 if (vma_wants_writenotify(vma)) { 89539 if (vma_wants_writenotify(vma)) {
89540 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); 89540 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
89541@@ -337,6 +453,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 89541@@ -342,6 +458,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
89542 end = start + len; 89542 end = start + len;
89543 if (end <= start) 89543 if (end <= start)
89544 return -ENOMEM; 89544 return -ENOMEM;
@@ -89556,7 +89556,7 @@ index 2bbb648..1658c46 100644
89556 if (!arch_validate_prot(prot)) 89556 if (!arch_validate_prot(prot))
89557 return -EINVAL; 89557 return -EINVAL;
89558 89558
89559@@ -344,7 +471,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 89559@@ -349,7 +476,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
89560 /* 89560 /*
89561 * Does the application expect PROT_READ to imply PROT_EXEC: 89561 * Does the application expect PROT_READ to imply PROT_EXEC:
89562 */ 89562 */
@@ -89565,7 +89565,7 @@ index 2bbb648..1658c46 100644
89565 prot |= PROT_EXEC; 89565 prot |= PROT_EXEC;
89566 89566
89567 vm_flags = calc_vm_prot_bits(prot); 89567 vm_flags = calc_vm_prot_bits(prot);
89568@@ -376,6 +503,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 89568@@ -381,6 +508,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
89569 if (start > vma->vm_start) 89569 if (start > vma->vm_start)
89570 prev = vma; 89570 prev = vma;
89571 89571
@@ -89577,7 +89577,7 @@ index 2bbb648..1658c46 100644
89577 for (nstart = start ; ; ) { 89577 for (nstart = start ; ; ) {
89578 unsigned long newflags; 89578 unsigned long newflags;
89579 89579
89580@@ -386,6 +518,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 89580@@ -391,6 +523,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
89581 89581
89582 /* newflags >> 4 shift VM_MAY% in place of VM_% */ 89582 /* newflags >> 4 shift VM_MAY% in place of VM_% */
89583 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) { 89583 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
@@ -89592,7 +89592,7 @@ index 2bbb648..1658c46 100644
89592 error = -EACCES; 89592 error = -EACCES;
89593 goto out; 89593 goto out;
89594 } 89594 }
89595@@ -400,6 +540,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, 89595@@ -405,6 +545,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
89596 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); 89596 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
89597 if (error) 89597 if (error)
89598 goto out; 89598 goto out;
@@ -91450,7 +91450,7 @@ index d456560..3ed6863 100644
91450 if (v->nr_pages) 91450 if (v->nr_pages)
91451 seq_printf(m, " pages=%d", v->nr_pages); 91451 seq_printf(m, " pages=%d", v->nr_pages);
91452diff --git a/mm/vmstat.c b/mm/vmstat.c 91452diff --git a/mm/vmstat.c b/mm/vmstat.c
91453index f42745e..62f8346 100644 91453index 10bbb54..7a0cf21 100644
91454--- a/mm/vmstat.c 91454--- a/mm/vmstat.c
91455+++ b/mm/vmstat.c 91455+++ b/mm/vmstat.c
91456@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu) 91456@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu)
@@ -91491,7 +91491,7 @@ index f42745e..62f8346 100644
91491 } 91491 }
91492 } 91492 }
91493 #endif 91493 #endif
91494@@ -1226,7 +1226,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb, 91494@@ -1227,7 +1227,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
91495 return NOTIFY_OK; 91495 return NOTIFY_OK;
91496 } 91496 }
91497 91497
@@ -91500,7 +91500,7 @@ index f42745e..62f8346 100644
91500 { &vmstat_cpuup_callback, NULL, 0 }; 91500 { &vmstat_cpuup_callback, NULL, 0 };
91501 #endif 91501 #endif
91502 91502
91503@@ -1241,10 +1241,20 @@ static int __init setup_vmstat(void) 91503@@ -1242,10 +1242,20 @@ static int __init setup_vmstat(void)
91504 start_cpu_timer(cpu); 91504 start_cpu_timer(cpu);
91505 #endif 91505 #endif
91506 #ifdef CONFIG_PROC_FS 91506 #ifdef CONFIG_PROC_FS
@@ -92001,10 +92001,10 @@ index 7c88f5f..b65befb 100644
92001 destroy_workqueue(hdev->workqueue); 92001 destroy_workqueue(hdev->workqueue);
92002 error = -ENOMEM; 92002 error = -ENOMEM;
92003diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c 92003diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
92004index 9bd7d95..6c4884f 100644 92004index fa4bf66..e92948f 100644
92005--- a/net/bluetooth/hci_sock.c 92005--- a/net/bluetooth/hci_sock.c
92006+++ b/net/bluetooth/hci_sock.c 92006+++ b/net/bluetooth/hci_sock.c
92007@@ -934,7 +934,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, 92007@@ -932,7 +932,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
92008 uf.event_mask[1] = *((u32 *) f->event_mask + 1); 92008 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
92009 } 92009 }
92010 92010
@@ -92082,10 +92082,10 @@ index 36fed40..be2eeb2 100644
92082 err = -EFAULT; 92082 err = -EFAULT;
92083 break; 92083 break;
92084diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c 92084diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
92085index 30b3721..c1bd0a0 100644 92085index c1c6028..17e8dcc 100644
92086--- a/net/bluetooth/rfcomm/sock.c 92086--- a/net/bluetooth/rfcomm/sock.c
92087+++ b/net/bluetooth/rfcomm/sock.c 92087+++ b/net/bluetooth/rfcomm/sock.c
92088@@ -666,7 +666,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c 92088@@ -665,7 +665,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
92089 struct sock *sk = sock->sk; 92089 struct sock *sk = sock->sk;
92090 struct bt_security sec; 92090 struct bt_security sec;
92091 int err = 0; 92091 int err = 0;
@@ -92094,7 +92094,7 @@ index 30b3721..c1bd0a0 100644
92094 u32 opt; 92094 u32 opt;
92095 92095
92096 BT_DBG("sk %p", sk); 92096 BT_DBG("sk %p", sk);
92097@@ -688,7 +688,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c 92097@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
92098 92098
92099 sec.level = BT_SECURITY_LOW; 92099 sec.level = BT_SECURITY_LOW;
92100 92100
@@ -92283,13 +92283,13 @@ index eb0a46a..5f3bae8 100644
92283 92283
92284 switch (ss->ss_family) { 92284 switch (ss->ss_family) {
92285diff --git a/net/compat.c b/net/compat.c 92285diff --git a/net/compat.c b/net/compat.c
92286index 8903258..24e30e5 100644 92286index dd32e34..6066f87 100644
92287--- a/net/compat.c 92287--- a/net/compat.c
92288+++ b/net/compat.c 92288+++ b/net/compat.c
92289@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) 92289@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
92290 return -EFAULT; 92290 return -EFAULT;
92291 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) 92291 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
92292 return -EINVAL; 92292 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
92293- kmsg->msg_name = compat_ptr(tmp1); 92293- kmsg->msg_name = compat_ptr(tmp1);
92294- kmsg->msg_iov = compat_ptr(tmp2); 92294- kmsg->msg_iov = compat_ptr(tmp2);
92295- kmsg->msg_control = compat_ptr(tmp3); 92295- kmsg->msg_control = compat_ptr(tmp3);
@@ -92308,7 +92308,7 @@ index 8903258..24e30e5 100644
92308 kern_msg->msg_namelen, 92308 kern_msg->msg_namelen,
92309 kern_address); 92309 kern_address);
92310 if (err < 0) 92310 if (err < 0)
92311@@ -98,7 +98,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, 92311@@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
92312 kern_msg->msg_name = NULL; 92312 kern_msg->msg_name = NULL;
92313 92313
92314 tot_len = iov_from_user_compat_to_kern(kern_iov, 92314 tot_len = iov_from_user_compat_to_kern(kern_iov,
@@ -92317,7 +92317,7 @@ index 8903258..24e30e5 100644
92317 kern_msg->msg_iovlen); 92317 kern_msg->msg_iovlen);
92318 if (tot_len >= 0) 92318 if (tot_len >= 0)
92319 kern_msg->msg_iov = kern_iov; 92319 kern_msg->msg_iov = kern_iov;
92320@@ -118,20 +118,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, 92320@@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
92321 92321
92322 #define CMSG_COMPAT_FIRSTHDR(msg) \ 92322 #define CMSG_COMPAT_FIRSTHDR(msg) \
92323 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \ 92323 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
@@ -92341,7 +92341,7 @@ index 8903258..24e30e5 100644
92341 msg->msg_controllen) 92341 msg->msg_controllen)
92342 return NULL; 92342 return NULL;
92343 return (struct compat_cmsghdr __user *)ptr; 92343 return (struct compat_cmsghdr __user *)ptr;
92344@@ -221,7 +221,7 @@ Efault: 92344@@ -222,7 +222,7 @@ Efault:
92345 92345
92346 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data) 92346 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
92347 { 92347 {
@@ -92350,7 +92350,7 @@ index 8903258..24e30e5 100644
92350 struct compat_cmsghdr cmhdr; 92350 struct compat_cmsghdr cmhdr;
92351 struct compat_timeval ctv; 92351 struct compat_timeval ctv;
92352 struct compat_timespec cts[3]; 92352 struct compat_timespec cts[3];
92353@@ -277,7 +277,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat 92353@@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
92354 92354
92355 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) 92355 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
92356 { 92356 {
@@ -92359,7 +92359,7 @@ index 8903258..24e30e5 100644
92359 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int); 92359 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
92360 int fdnum = scm->fp->count; 92360 int fdnum = scm->fp->count;
92361 struct file **fp = scm->fp->fp; 92361 struct file **fp = scm->fp->fp;
92362@@ -365,7 +365,7 @@ static int do_set_sock_timeout(struct socket *sock, int level, 92362@@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
92363 return -EFAULT; 92363 return -EFAULT;
92364 old_fs = get_fs(); 92364 old_fs = get_fs();
92365 set_fs(KERNEL_DS); 92365 set_fs(KERNEL_DS);
@@ -92368,7 +92368,7 @@ index 8903258..24e30e5 100644
92368 set_fs(old_fs); 92368 set_fs(old_fs);
92369 92369
92370 return err; 92370 return err;
92371@@ -426,7 +426,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname, 92371@@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
92372 len = sizeof(ktime); 92372 len = sizeof(ktime);
92373 old_fs = get_fs(); 92373 old_fs = get_fs();
92374 set_fs(KERNEL_DS); 92374 set_fs(KERNEL_DS);
@@ -92377,7 +92377,7 @@ index 8903258..24e30e5 100644
92377 set_fs(old_fs); 92377 set_fs(old_fs);
92378 92378
92379 if (!err) { 92379 if (!err) {
92380@@ -569,7 +569,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, 92380@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
92381 case MCAST_JOIN_GROUP: 92381 case MCAST_JOIN_GROUP:
92382 case MCAST_LEAVE_GROUP: 92382 case MCAST_LEAVE_GROUP:
92383 { 92383 {
@@ -92386,7 +92386,7 @@ index 8903258..24e30e5 100644
92386 struct group_req __user *kgr = 92386 struct group_req __user *kgr =
92387 compat_alloc_user_space(sizeof(struct group_req)); 92387 compat_alloc_user_space(sizeof(struct group_req));
92388 u32 interface; 92388 u32 interface;
92389@@ -590,7 +590,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, 92389@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
92390 case MCAST_BLOCK_SOURCE: 92390 case MCAST_BLOCK_SOURCE:
92391 case MCAST_UNBLOCK_SOURCE: 92391 case MCAST_UNBLOCK_SOURCE:
92392 { 92392 {
@@ -92395,7 +92395,7 @@ index 8903258..24e30e5 100644
92395 struct group_source_req __user *kgsr = compat_alloc_user_space( 92395 struct group_source_req __user *kgsr = compat_alloc_user_space(
92396 sizeof(struct group_source_req)); 92396 sizeof(struct group_source_req));
92397 u32 interface; 92397 u32 interface;
92398@@ -611,7 +611,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, 92398@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
92399 } 92399 }
92400 case MCAST_MSFILTER: 92400 case MCAST_MSFILTER:
92401 { 92401 {
@@ -92404,7 +92404,7 @@ index 8903258..24e30e5 100644
92404 struct group_filter __user *kgf; 92404 struct group_filter __user *kgf;
92405 u32 interface, fmode, numsrc; 92405 u32 interface, fmode, numsrc;
92406 92406
92407@@ -649,7 +649,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname, 92407@@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
92408 char __user *optval, int __user *optlen, 92408 char __user *optval, int __user *optlen,
92409 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *)) 92409 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
92410 { 92410 {
@@ -92413,7 +92413,7 @@ index 8903258..24e30e5 100644
92413 struct group_filter __user *kgf; 92413 struct group_filter __user *kgf;
92414 int __user *koptlen; 92414 int __user *koptlen;
92415 u32 interface, fmode, numsrc; 92415 u32 interface, fmode, numsrc;
92416@@ -807,7 +807,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args) 92416@@ -808,7 +808,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
92417 92417
92418 if (call < SYS_SOCKET || call > SYS_SENDMMSG) 92418 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
92419 return -EINVAL; 92419 return -EINVAL;
@@ -92436,7 +92436,7 @@ index b71423d..0360434 100644
92436 92436
92437 return err; 92437 return err;
92438diff --git a/net/core/dev.c b/net/core/dev.c 92438diff --git a/net/core/dev.c b/net/core/dev.c
92439index 7ddbb31..3902452 100644 92439index 1283c84..60f0253 100644
92440--- a/net/core/dev.c 92440--- a/net/core/dev.c
92441+++ b/net/core/dev.c 92441+++ b/net/core/dev.c
92442@@ -1649,7 +1649,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) 92442@@ -1649,7 +1649,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
@@ -92612,7 +92612,7 @@ index 7102f16..146b4bd 100644
92612 fle->object = flo; 92612 fle->object = flo;
92613 else 92613 else
92614diff --git a/net/core/iovec.c b/net/core/iovec.c 92614diff --git a/net/core/iovec.c b/net/core/iovec.c
92615index de178e4..1dabd8b 100644 92615index 9a31515..4fd45a6 100644
92616--- a/net/core/iovec.c 92616--- a/net/core/iovec.c
92617+++ b/net/core/iovec.c 92617+++ b/net/core/iovec.c
92618@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a 92618@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
@@ -92624,7 +92624,7 @@ index de178e4..1dabd8b 100644
92624 err = move_addr_to_kernel(namep, m->msg_namelen, 92624 err = move_addr_to_kernel(namep, m->msg_namelen,
92625 address); 92625 address);
92626 if (err < 0) 92626 if (err < 0)
92627@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a 92627@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
92628 } 92628 }
92629 92629
92630 size = m->msg_iovlen * sizeof(struct iovec); 92630 size = m->msg_iovlen * sizeof(struct iovec);
@@ -92819,10 +92819,10 @@ index b4da80b..98d6bdb 100644
92819 { 92819 {
92820 struct socket *sock; 92820 struct socket *sock;
92821diff --git a/net/core/skbuff.c b/net/core/skbuff.c 92821diff --git a/net/core/skbuff.c b/net/core/skbuff.c
92822index 1c1738c..4cab7f0 100644 92822index d9e8736..6abcdf9 100644
92823--- a/net/core/skbuff.c 92823--- a/net/core/skbuff.c
92824+++ b/net/core/skbuff.c 92824+++ b/net/core/skbuff.c
92825@@ -3087,13 +3087,15 @@ void __init skb_init(void) 92825@@ -3084,13 +3084,15 @@ void __init skb_init(void)
92826 skbuff_head_cache = kmem_cache_create("skbuff_head_cache", 92826 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
92827 sizeof(struct sk_buff), 92827 sizeof(struct sk_buff),
92828 0, 92828 0,
@@ -93094,7 +93094,7 @@ index a55eecc..dd8428c 100644
93094 93094
93095 *lenp = len; 93095 *lenp = len;
93096diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c 93096diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
93097index 55e1fd5..fd602b8 100644 93097index 31b127e..627fdea 100644
93098--- a/net/ieee802154/6lowpan.c 93098--- a/net/ieee802154/6lowpan.c
93099+++ b/net/ieee802154/6lowpan.c 93099+++ b/net/ieee802154/6lowpan.c
93100@@ -459,7 +459,7 @@ static int lowpan_header_create(struct sk_buff *skb, 93100@@ -459,7 +459,7 @@ static int lowpan_header_create(struct sk_buff *skb,
@@ -93421,10 +93421,10 @@ index 64e4e98..db77052 100644
93421 .maxtype = IFLA_GRE_MAX, 93421 .maxtype = IFLA_GRE_MAX,
93422 .policy = ipgre_policy, 93422 .policy = ipgre_policy,
93423diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c 93423diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
93424index d9c4f11..02b82dbc 100644 93424index 23e6ab0..be67a57 100644
93425--- a/net/ipv4/ip_sockglue.c 93425--- a/net/ipv4/ip_sockglue.c
93426+++ b/net/ipv4/ip_sockglue.c 93426+++ b/net/ipv4/ip_sockglue.c
93427@@ -1152,7 +1152,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, 93427@@ -1153,7 +1153,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
93428 len = min_t(unsigned int, len, opt->optlen); 93428 len = min_t(unsigned int, len, opt->optlen);
93429 if (put_user(len, optlen)) 93429 if (put_user(len, optlen))
93430 return -EFAULT; 93430 return -EFAULT;
@@ -93434,7 +93434,7 @@ index d9c4f11..02b82dbc 100644
93434 return -EFAULT; 93434 return -EFAULT;
93435 return 0; 93435 return 0;
93436 } 93436 }
93437@@ -1283,7 +1284,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, 93437@@ -1284,7 +1285,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
93438 if (sk->sk_type != SOCK_STREAM) 93438 if (sk->sk_type != SOCK_STREAM)
93439 return -ENOPROTOOPT; 93439 return -ENOPROTOOPT;
93440 93440
@@ -93444,7 +93444,7 @@ index d9c4f11..02b82dbc 100644
93444 msg.msg_flags = flags; 93444 msg.msg_flags = flags;
93445 93445
93446diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c 93446diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
93447index 0656041..d6ecb60 100644 93447index feb19db..61aa09b 100644
93448--- a/net/ipv4/ip_vti.c 93448--- a/net/ipv4/ip_vti.c
93449+++ b/net/ipv4/ip_vti.c 93449+++ b/net/ipv4/ip_vti.c
93450@@ -47,7 +47,7 @@ 93450@@ -47,7 +47,7 @@
@@ -93456,7 +93456,7 @@ index 0656041..d6ecb60 100644
93456 93456
93457 static int vti_net_id __read_mostly; 93457 static int vti_net_id __read_mostly;
93458 struct vti_net { 93458 struct vti_net {
93459@@ -848,7 +848,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = { 93459@@ -849,7 +849,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
93460 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) }, 93460 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
93461 }; 93461 };
93462 93462
@@ -93630,10 +93630,10 @@ index d23118d..6ad7277 100644
93630 93630
93631 case IPT_SO_GET_ENTRIES: 93631 case IPT_SO_GET_ENTRIES:
93632diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c 93632diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
93633index 7d93d62..cbbf2a3 100644 93633index 8cae28f..049d45a 100644
93634--- a/net/ipv4/ping.c 93634--- a/net/ipv4/ping.c
93635+++ b/net/ipv4/ping.c 93635+++ b/net/ipv4/ping.c
93636@@ -843,7 +843,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f, 93636@@ -842,7 +842,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
93637 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)), 93637 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
93638 0, sock_i_ino(sp), 93638 0, sock_i_ino(sp),
93639 atomic_read(&sp->sk_refcnt), sp, 93639 atomic_read(&sp->sk_refcnt), sp,
@@ -93643,7 +93643,7 @@ index 7d93d62..cbbf2a3 100644
93643 93643
93644 static int ping_seq_show(struct seq_file *seq, void *v) 93644 static int ping_seq_show(struct seq_file *seq, void *v)
93645diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c 93645diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
93646index 6fb2337..9cd6b20 100644 93646index 402870f..4651346 100644
93647--- a/net/ipv4/raw.c 93647--- a/net/ipv4/raw.c
93648+++ b/net/ipv4/raw.c 93648+++ b/net/ipv4/raw.c
93649@@ -309,7 +309,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) 93649@@ -309,7 +309,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
@@ -93655,7 +93655,7 @@ index 6fb2337..9cd6b20 100644
93655 kfree_skb(skb); 93655 kfree_skb(skb);
93656 return NET_RX_DROP; 93656 return NET_RX_DROP;
93657 } 93657 }
93658@@ -746,16 +746,20 @@ static int raw_init(struct sock *sk) 93658@@ -744,16 +744,20 @@ static int raw_init(struct sock *sk)
93659 93659
93660 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen) 93660 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
93661 { 93661 {
@@ -93677,7 +93677,7 @@ index 6fb2337..9cd6b20 100644
93677 93677
93678 if (get_user(len, optlen)) 93678 if (get_user(len, optlen))
93679 goto out; 93679 goto out;
93680@@ -765,8 +769,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o 93680@@ -763,8 +767,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
93681 if (len > sizeof(struct icmp_filter)) 93681 if (len > sizeof(struct icmp_filter))
93682 len = sizeof(struct icmp_filter); 93682 len = sizeof(struct icmp_filter);
93683 ret = -EFAULT; 93683 ret = -EFAULT;
@@ -93688,7 +93688,7 @@ index 6fb2337..9cd6b20 100644
93688 goto out; 93688 goto out;
93689 ret = 0; 93689 ret = 0;
93690 out: return ret; 93690 out: return ret;
93691@@ -995,7 +999,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) 93691@@ -993,7 +997,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
93692 0, 0L, 0, 93692 0, 0L, 0,
93693 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)), 93693 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
93694 0, sock_i_ino(sp), 93694 0, sock_i_ino(sp),
@@ -93698,10 +93698,10 @@ index 6fb2337..9cd6b20 100644
93698 93698
93699 static int raw_seq_show(struct seq_file *seq, void *v) 93699 static int raw_seq_show(struct seq_file *seq, void *v)
93700diff --git a/net/ipv4/route.c b/net/ipv4/route.c 93700diff --git a/net/ipv4/route.c b/net/ipv4/route.c
93701index d11e73c..25c1dc4 100644 93701index f6c6ab1..e0dae89 100644
93702--- a/net/ipv4/route.c 93702--- a/net/ipv4/route.c
93703+++ b/net/ipv4/route.c 93703+++ b/net/ipv4/route.c
93704@@ -2558,34 +2558,34 @@ static struct ctl_table ipv4_route_flush_table[] = { 93704@@ -2562,34 +2562,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
93705 .maxlen = sizeof(int), 93705 .maxlen = sizeof(int),
93706 .mode = 0200, 93706 .mode = 0200,
93707 .proc_handler = ipv4_sysctl_rtcache_flush, 93707 .proc_handler = ipv4_sysctl_rtcache_flush,
@@ -93744,7 +93744,7 @@ index d11e73c..25c1dc4 100644
93744 err_dup: 93744 err_dup:
93745 return -ENOMEM; 93745 return -ENOMEM;
93746 } 93746 }
93747@@ -2608,7 +2608,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = { 93747@@ -2612,7 +2612,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
93748 93748
93749 static __net_init int rt_genid_init(struct net *net) 93749 static __net_init int rt_genid_init(struct net *net)
93750 { 93750 {
@@ -93932,7 +93932,7 @@ index e15d330..c93711a 100644
93932 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0) 93932 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
93933 return 1; 93933 return 1;
93934diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c 93934diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
93935index 7999fc5..c812f42 100644 93935index 5d87806..1b9673a 100644
93936--- a/net/ipv4/tcp_ipv4.c 93936--- a/net/ipv4/tcp_ipv4.c
93937+++ b/net/ipv4/tcp_ipv4.c 93937+++ b/net/ipv4/tcp_ipv4.c
93938@@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly; 93938@@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly;
@@ -94060,7 +94060,7 @@ index 4b85e6f..22f9ac9 100644
94060 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { 94060 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
94061 /* Has it gone just too far? */ 94061 /* Has it gone just too far? */
94062diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c 94062diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
94063index 93b731d..5a2dd92 100644 94063index c3075b5..6b23f6c 100644
94064--- a/net/ipv4/udp.c 94064--- a/net/ipv4/udp.c
94065+++ b/net/ipv4/udp.c 94065+++ b/net/ipv4/udp.c
94066@@ -87,6 +87,7 @@ 94066@@ -87,6 +87,7 @@
@@ -94111,7 +94111,7 @@ index 93b731d..5a2dd92 100644
94111 daddr = inet->inet_daddr; 94111 daddr = inet->inet_daddr;
94112 dport = inet->inet_dport; 94112 dport = inet->inet_dport;
94113 /* Open fast path for connected socket. 94113 /* Open fast path for connected socket.
94114@@ -1136,7 +1153,7 @@ static unsigned int first_packet_length(struct sock *sk) 94114@@ -1139,7 +1156,7 @@ static unsigned int first_packet_length(struct sock *sk)
94115 IS_UDPLITE(sk)); 94115 IS_UDPLITE(sk));
94116 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, 94116 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
94117 IS_UDPLITE(sk)); 94117 IS_UDPLITE(sk));
@@ -94120,7 +94120,7 @@ index 93b731d..5a2dd92 100644
94120 __skb_unlink(skb, rcvq); 94120 __skb_unlink(skb, rcvq);
94121 __skb_queue_tail(&list_kill, skb); 94121 __skb_queue_tail(&list_kill, skb);
94122 } 94122 }
94123@@ -1222,6 +1239,10 @@ try_again: 94123@@ -1219,6 +1236,10 @@ try_again:
94124 if (!skb) 94124 if (!skb)
94125 goto out; 94125 goto out;
94126 94126
@@ -94131,7 +94131,7 @@ index 93b731d..5a2dd92 100644
94131 ulen = skb->len - sizeof(struct udphdr); 94131 ulen = skb->len - sizeof(struct udphdr);
94132 copied = len; 94132 copied = len;
94133 if (copied > ulen) 94133 if (copied > ulen)
94134@@ -1255,7 +1276,7 @@ try_again: 94134@@ -1252,7 +1273,7 @@ try_again:
94135 if (unlikely(err)) { 94135 if (unlikely(err)) {
94136 trace_kfree_skb(skb, udp_recvmsg); 94136 trace_kfree_skb(skb, udp_recvmsg);
94137 if (!peeked) { 94137 if (!peeked) {
@@ -94140,7 +94140,7 @@ index 93b731d..5a2dd92 100644
94140 UDP_INC_STATS_USER(sock_net(sk), 94140 UDP_INC_STATS_USER(sock_net(sk),
94141 UDP_MIB_INERRORS, is_udplite); 94141 UDP_MIB_INERRORS, is_udplite);
94142 } 94142 }
94143@@ -1542,7 +1563,7 @@ csum_error: 94143@@ -1540,7 +1561,7 @@ csum_error:
94144 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite); 94144 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
94145 drop: 94145 drop:
94146 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); 94146 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -94149,7 +94149,7 @@ index 93b731d..5a2dd92 100644
94149 kfree_skb(skb); 94149 kfree_skb(skb);
94150 return -1; 94150 return -1;
94151 } 94151 }
94152@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count, 94152@@ -1559,7 +1580,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
94153 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); 94153 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
94154 94154
94155 if (!skb1) { 94155 if (!skb1) {
@@ -94158,7 +94158,7 @@ index 93b731d..5a2dd92 100644
94158 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, 94158 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
94159 IS_UDPLITE(sk)); 94159 IS_UDPLITE(sk));
94160 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, 94160 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
94161@@ -1730,6 +1751,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, 94161@@ -1728,6 +1749,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
94162 goto csum_error; 94162 goto csum_error;
94163 94163
94164 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); 94164 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -94168,7 +94168,7 @@ index 93b731d..5a2dd92 100644
94168 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 94168 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
94169 94169
94170 /* 94170 /*
94171@@ -2160,7 +2184,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, 94171@@ -2158,7 +2182,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
94172 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)), 94172 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
94173 0, sock_i_ino(sp), 94173 0, sock_i_ino(sp),
94174 atomic_read(&sp->sk_refcnt), sp, 94174 atomic_read(&sp->sk_refcnt), sp,
@@ -94425,7 +94425,7 @@ index 44400c2..8e11f52 100644
94425 94425
94426 case IP6T_SO_GET_ENTRIES: 94426 case IP6T_SO_GET_ENTRIES:
94427diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c 94427diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
94428index dffdc1a..ccc6678 100644 94428index 253566a..9fa50c7 100644
94429--- a/net/ipv6/netfilter/nf_conntrack_reasm.c 94429--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
94430+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c 94430+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
94431@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = { 94431@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
@@ -94500,7 +94500,7 @@ index c2e73e6..12cca6f 100644
94500 EXPORT_SYMBOL(ipv6_select_ident); 94500 EXPORT_SYMBOL(ipv6_select_ident);
94501 94501
94502diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c 94502diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
94503index eedff8c..7d7e24a 100644 94503index 464b1c9..673cedb 100644
94504--- a/net/ipv6/raw.c 94504--- a/net/ipv6/raw.c
94505+++ b/net/ipv6/raw.c 94505+++ b/net/ipv6/raw.c
94506@@ -108,7 +108,7 @@ found: 94506@@ -108,7 +108,7 @@ found:
@@ -94539,7 +94539,7 @@ index eedff8c..7d7e24a 100644
94539 kfree_skb(skb); 94539 kfree_skb(skb);
94540 return NET_RX_DROP; 94540 return NET_RX_DROP;
94541 } 94541 }
94542@@ -602,7 +602,7 @@ out: 94542@@ -600,7 +600,7 @@ out:
94543 return err; 94543 return err;
94544 } 94544 }
94545 94545
@@ -94548,7 +94548,7 @@ index eedff8c..7d7e24a 100644
94548 struct flowi6 *fl6, struct dst_entry **dstp, 94548 struct flowi6 *fl6, struct dst_entry **dstp,
94549 unsigned int flags) 94549 unsigned int flags)
94550 { 94550 {
94551@@ -914,12 +914,15 @@ do_confirm: 94551@@ -912,12 +912,15 @@ do_confirm:
94552 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname, 94552 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
94553 char __user *optval, int optlen) 94553 char __user *optval, int optlen)
94554 { 94554 {
@@ -94565,7 +94565,7 @@ index eedff8c..7d7e24a 100644
94565 return 0; 94565 return 0;
94566 default: 94566 default:
94567 return -ENOPROTOOPT; 94567 return -ENOPROTOOPT;
94568@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, 94568@@ -930,6 +933,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
94569 char __user *optval, int __user *optlen) 94569 char __user *optval, int __user *optlen)
94570 { 94570 {
94571 int len; 94571 int len;
@@ -94573,7 +94573,7 @@ index eedff8c..7d7e24a 100644
94573 94573
94574 switch (optname) { 94574 switch (optname) {
94575 case ICMPV6_FILTER: 94575 case ICMPV6_FILTER:
94576@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, 94576@@ -941,7 +945,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
94577 len = sizeof(struct icmp6_filter); 94577 len = sizeof(struct icmp6_filter);
94578 if (put_user(len, optlen)) 94578 if (put_user(len, optlen))
94579 return -EFAULT; 94579 return -EFAULT;
@@ -94583,7 +94583,7 @@ index eedff8c..7d7e24a 100644
94583 return -EFAULT; 94583 return -EFAULT;
94584 return 0; 94584 return 0;
94585 default: 94585 default:
94586@@ -1251,7 +1256,7 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) 94586@@ -1249,7 +1254,7 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
94587 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)), 94587 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
94588 0, 94588 0,
94589 sock_i_ino(sp), 94589 sock_i_ino(sp),
@@ -94635,10 +94635,10 @@ index 1aeb473..bea761c 100644
94635 return -ENOMEM; 94635 return -ENOMEM;
94636 } 94636 }
94637diff --git a/net/ipv6/route.c b/net/ipv6/route.c 94637diff --git a/net/ipv6/route.c b/net/ipv6/route.c
94638index 548a1f7c..63ee520 100644 94638index 5a8bf536..72b1d94 100644
94639--- a/net/ipv6/route.c 94639--- a/net/ipv6/route.c
94640+++ b/net/ipv6/route.c 94640+++ b/net/ipv6/route.c
94641@@ -2934,7 +2934,7 @@ ctl_table ipv6_route_table_template[] = { 94641@@ -2937,7 +2937,7 @@ ctl_table ipv6_route_table_template[] = {
94642 94642
94643 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) 94643 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
94644 { 94644 {
@@ -94742,7 +94742,7 @@ index 66c7188..5600868 100644
94742 } 94742 }
94743 94743
94744diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c 94744diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
94745index e7b28f9..d09c290 100644 94745index 6b298dc..c3e5995 100644
94746--- a/net/ipv6/udp.c 94746--- a/net/ipv6/udp.c
94747+++ b/net/ipv6/udp.c 94747+++ b/net/ipv6/udp.c
94748@@ -52,6 +52,10 @@ 94748@@ -52,6 +52,10 @@
@@ -94756,7 +94756,7 @@ index e7b28f9..d09c290 100644
94756 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) 94756 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
94757 { 94757 {
94758 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; 94758 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
94759@@ -419,7 +423,7 @@ try_again: 94759@@ -416,7 +420,7 @@ try_again:
94760 if (unlikely(err)) { 94760 if (unlikely(err)) {
94761 trace_kfree_skb(skb, udpv6_recvmsg); 94761 trace_kfree_skb(skb, udpv6_recvmsg);
94762 if (!peeked) { 94762 if (!peeked) {
@@ -94765,7 +94765,7 @@ index e7b28f9..d09c290 100644
94765 if (is_udp4) 94765 if (is_udp4)
94766 UDP_INC_STATS_USER(sock_net(sk), 94766 UDP_INC_STATS_USER(sock_net(sk),
94767 UDP_MIB_INERRORS, 94767 UDP_MIB_INERRORS,
94768@@ -665,7 +669,7 @@ csum_error: 94768@@ -662,7 +666,7 @@ csum_error:
94769 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite); 94769 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
94770 drop: 94770 drop:
94771 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); 94771 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -94774,7 +94774,7 @@ index e7b28f9..d09c290 100644
94774 kfree_skb(skb); 94774 kfree_skb(skb);
94775 return -1; 94775 return -1;
94776 } 94776 }
94777@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count, 94777@@ -720,7 +724,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
94778 if (likely(skb1 == NULL)) 94778 if (likely(skb1 == NULL))
94779 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); 94779 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
94780 if (!skb1) { 94780 if (!skb1) {
@@ -94783,7 +94783,7 @@ index e7b28f9..d09c290 100644
94783 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, 94783 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
94784 IS_UDPLITE(sk)); 94784 IS_UDPLITE(sk));
94785 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, 94785 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
94786@@ -860,6 +864,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, 94786@@ -857,6 +861,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
94787 goto csum_error; 94787 goto csum_error;
94788 94788
94789 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); 94789 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -94793,7 +94793,7 @@ index e7b28f9..d09c290 100644
94793 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); 94793 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
94794 94794
94795 kfree_skb(skb); 94795 kfree_skb(skb);
94796@@ -1392,7 +1399,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket 94796@@ -1389,7 +1396,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
94797 0, 94797 0,
94798 sock_i_ino(sp), 94798 sock_i_ino(sp),
94799 atomic_read(&sp->sk_refcnt), sp, 94799 atomic_read(&sp->sk_refcnt), sp,
@@ -94917,7 +94917,7 @@ index 41ac7938..75e3bb1 100644
94917 seq_printf(m, "Max header size: %d\n", self->max_header_size); 94917 seq_printf(m, "Max header size: %d\n", self->max_header_size);
94918 94918
94919diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c 94919diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
94920index ae69165..c8b82d8 100644 94920index 276aa86..aeb81c8 100644
94921--- a/net/iucv/af_iucv.c 94921--- a/net/iucv/af_iucv.c
94922+++ b/net/iucv/af_iucv.c 94922+++ b/net/iucv/af_iucv.c
94923@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk) 94923@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
@@ -94947,7 +94947,7 @@ index 4fe76ff..426a904 100644
94947 }; 94947 };
94948 94948
94949diff --git a/net/key/af_key.c b/net/key/af_key.c 94949diff --git a/net/key/af_key.c b/net/key/af_key.c
94950index ab8bd2c..cd2d641 100644 94950index 66f51c5..8f0eef1 100644
94951--- a/net/key/af_key.c 94951--- a/net/key/af_key.c
94952+++ b/net/key/af_key.c 94952+++ b/net/key/af_key.c
94953@@ -3048,10 +3048,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc 94953@@ -3048,10 +3048,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
@@ -95272,7 +95272,7 @@ index a083bda..da661c3 100644
95272 95272
95273 if (!todrop_rate[i]) return 0; 95273 if (!todrop_rate[i]) return 0;
95274diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c 95274diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
95275index 23b8eb5..48a8959 100644 95275index 21a3a47..268e13e 100644
95276--- a/net/netfilter/ipvs/ip_vs_core.c 95276--- a/net/netfilter/ipvs/ip_vs_core.c
95277+++ b/net/netfilter/ipvs/ip_vs_core.c 95277+++ b/net/netfilter/ipvs/ip_vs_core.c
95278@@ -559,7 +559,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 95278@@ -559,7 +559,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
@@ -95284,7 +95284,7 @@ index 23b8eb5..48a8959 100644
95284 ip_vs_conn_put(cp); 95284 ip_vs_conn_put(cp);
95285 return ret; 95285 return ret;
95286 } 95286 }
95287@@ -1711,7 +1711,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) 95287@@ -1698,7 +1698,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
95288 if (cp->flags & IP_VS_CONN_F_ONE_PACKET) 95288 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
95289 pkts = sysctl_sync_threshold(ipvs); 95289 pkts = sysctl_sync_threshold(ipvs);
95290 else 95290 else
@@ -95949,7 +95949,7 @@ index 4fe4fb4..87a89e5 100644
95949 return 0; 95949 return 0;
95950 } 95950 }
95951diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c 95951diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
95952index 57ee84d..8b99cf5 100644 95952index c9c2a84..ae00c02 100644
95953--- a/net/netlink/af_netlink.c 95953--- a/net/netlink/af_netlink.c
95954+++ b/net/netlink/af_netlink.c 95954+++ b/net/netlink/af_netlink.c
95955@@ -121,7 +121,7 @@ static void netlink_overrun(struct sock *sk) 95955@@ -121,7 +121,7 @@ static void netlink_overrun(struct sock *sk)
@@ -95961,7 +95961,7 @@ index 57ee84d..8b99cf5 100644
95961 } 95961 }
95962 95962
95963 static void netlink_rcv_wake(struct sock *sk) 95963 static void netlink_rcv_wake(struct sock *sk)
95964@@ -2771,7 +2771,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v) 95964@@ -2769,7 +2769,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
95965 sk_wmem_alloc_get(s), 95965 sk_wmem_alloc_get(s),
95966 nlk->cb, 95966 nlk->cb,
95967 atomic_read(&s->sk_refcnt), 95967 atomic_read(&s->sk_refcnt),
@@ -96013,7 +96013,7 @@ index 393f17e..a64232c 100644
96013 } 96013 }
96014 } 96014 }
96015diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c 96015diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
96016index ec0c80f..41e1830 100644 96016index 13b92982..9ae9c97 100644
96017--- a/net/netrom/af_netrom.c 96017--- a/net/netrom/af_netrom.c
96018+++ b/net/netrom/af_netrom.c 96018+++ b/net/netrom/af_netrom.c
96019@@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr, 96019@@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
@@ -96025,10 +96025,10 @@ index ec0c80f..41e1830 100644
96025 *uaddr_len = sizeof(struct sockaddr_ax25); 96025 *uaddr_len = sizeof(struct sockaddr_ax25);
96026 } 96026 }
96027diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c 96027diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
96028index a6895ab..722fa96 100644 96028index c503ad6..fbb6ef8 100644
96029--- a/net/packet/af_packet.c 96029--- a/net/packet/af_packet.c
96030+++ b/net/packet/af_packet.c 96030+++ b/net/packet/af_packet.c
96031@@ -1681,7 +1681,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, 96031@@ -1688,7 +1688,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
96032 96032
96033 spin_lock(&sk->sk_receive_queue.lock); 96033 spin_lock(&sk->sk_receive_queue.lock);
96034 po->stats.stats1.tp_packets++; 96034 po->stats.stats1.tp_packets++;
@@ -96037,7 +96037,7 @@ index a6895ab..722fa96 100644
96037 __skb_queue_tail(&sk->sk_receive_queue, skb); 96037 __skb_queue_tail(&sk->sk_receive_queue, skb);
96038 spin_unlock(&sk->sk_receive_queue.lock); 96038 spin_unlock(&sk->sk_receive_queue.lock);
96039 sk->sk_data_ready(sk, skb->len); 96039 sk->sk_data_ready(sk, skb->len);
96040@@ -1690,7 +1690,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, 96040@@ -1697,7 +1697,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
96041 drop_n_acct: 96041 drop_n_acct:
96042 spin_lock(&sk->sk_receive_queue.lock); 96042 spin_lock(&sk->sk_receive_queue.lock);
96043 po->stats.stats1.tp_drops++; 96043 po->stats.stats1.tp_drops++;
@@ -96046,7 +96046,7 @@ index a6895ab..722fa96 100644
96046 spin_unlock(&sk->sk_receive_queue.lock); 96046 spin_unlock(&sk->sk_receive_queue.lock);
96047 96047
96048 drop_n_restore: 96048 drop_n_restore:
96049@@ -2640,6 +2640,7 @@ out: 96049@@ -2653,6 +2653,7 @@ out:
96050 96050
96051 static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len) 96051 static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
96052 { 96052 {
@@ -96054,7 +96054,7 @@ index a6895ab..722fa96 100644
96054 struct sock_exterr_skb *serr; 96054 struct sock_exterr_skb *serr;
96055 struct sk_buff *skb, *skb2; 96055 struct sk_buff *skb, *skb2;
96056 int copied, err; 96056 int copied, err;
96057@@ -2661,8 +2662,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len) 96057@@ -2674,8 +2675,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
96058 sock_recv_timestamp(msg, sk, skb); 96058 sock_recv_timestamp(msg, sk, skb);
96059 96059
96060 serr = SKB_EXT_ERR(skb); 96060 serr = SKB_EXT_ERR(skb);
@@ -96065,7 +96065,7 @@ index a6895ab..722fa96 100644
96065 96065
96066 msg->msg_flags |= MSG_ERRQUEUE; 96066 msg->msg_flags |= MSG_ERRQUEUE;
96067 err = copied; 96067 err = copied;
96068@@ -3283,7 +3285,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, 96068@@ -3294,7 +3296,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
96069 case PACKET_HDRLEN: 96069 case PACKET_HDRLEN:
96070 if (len > sizeof(int)) 96070 if (len > sizeof(int))
96071 len = sizeof(int); 96071 len = sizeof(int);
@@ -96074,7 +96074,7 @@ index a6895ab..722fa96 100644
96074 return -EFAULT; 96074 return -EFAULT;
96075 switch (val) { 96075 switch (val) {
96076 case TPACKET_V1: 96076 case TPACKET_V1:
96077@@ -3326,7 +3328,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, 96077@@ -3337,7 +3339,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
96078 len = lv; 96078 len = lv;
96079 if (put_user(len, optlen)) 96079 if (put_user(len, optlen))
96080 return -EFAULT; 96080 return -EFAULT;
@@ -96804,7 +96804,7 @@ index 098f1d5f..60da2f7 100644
96804 96804
96805 /* Start T3_rtx timer if it is not already running and update the heartbeat 96805 /* Start T3_rtx timer if it is not already running and update the heartbeat
96806diff --git a/net/socket.c b/net/socket.c 96806diff --git a/net/socket.c b/net/socket.c
96807index 9c467b2..f2cbd27 100644 96807index ac72efc..eac33e5 100644
96808--- a/net/socket.c 96808--- a/net/socket.c
96809+++ b/net/socket.c 96809+++ b/net/socket.c
96810@@ -88,6 +88,7 @@ 96810@@ -88,6 +88,7 @@
@@ -96824,7 +96824,7 @@ index 9c467b2..f2cbd27 100644
96824 static int sock_no_open(struct inode *irrelevant, struct file *dontcare); 96824 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
96825 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, 96825 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
96826 unsigned long nr_segs, loff_t pos); 96826 unsigned long nr_segs, loff_t pos);
96827@@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type, 96827@@ -322,7 +325,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
96828 &sockfs_dentry_operations, SOCKFS_MAGIC); 96828 &sockfs_dentry_operations, SOCKFS_MAGIC);
96829 } 96829 }
96830 96830
@@ -96833,7 +96833,7 @@ index 9c467b2..f2cbd27 100644
96833 96833
96834 static struct file_system_type sock_fs_type = { 96834 static struct file_system_type sock_fs_type = {
96835 .name = "sockfs", 96835 .name = "sockfs",
96836@@ -1246,6 +1249,8 @@ int __sock_create(struct net *net, int family, int type, int protocol, 96836@@ -1247,6 +1250,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
96837 return -EAFNOSUPPORT; 96837 return -EAFNOSUPPORT;
96838 if (type < 0 || type >= SOCK_MAX) 96838 if (type < 0 || type >= SOCK_MAX)
96839 return -EINVAL; 96839 return -EINVAL;
@@ -96842,7 +96842,7 @@ index 9c467b2..f2cbd27 100644
96842 96842
96843 /* Compatibility. 96843 /* Compatibility.
96844 96844
96845@@ -1377,6 +1382,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) 96845@@ -1378,6 +1383,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
96846 if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) 96846 if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
96847 flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; 96847 flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
96848 96848
@@ -96859,7 +96859,7 @@ index 9c467b2..f2cbd27 100644
96859 retval = sock_create(family, type, protocol, &sock); 96859 retval = sock_create(family, type, protocol, &sock);
96860 if (retval < 0) 96860 if (retval < 0)
96861 goto out; 96861 goto out;
96862@@ -1504,6 +1519,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) 96862@@ -1505,6 +1520,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
96863 if (sock) { 96863 if (sock) {
96864 err = move_addr_to_kernel(umyaddr, addrlen, &address); 96864 err = move_addr_to_kernel(umyaddr, addrlen, &address);
96865 if (err >= 0) { 96865 if (err >= 0) {
@@ -96874,7 +96874,7 @@ index 9c467b2..f2cbd27 100644
96874 err = security_socket_bind(sock, 96874 err = security_socket_bind(sock,
96875 (struct sockaddr *)&address, 96875 (struct sockaddr *)&address,
96876 addrlen); 96876 addrlen);
96877@@ -1512,6 +1535,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) 96877@@ -1513,6 +1536,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
96878 (struct sockaddr *) 96878 (struct sockaddr *)
96879 &address, addrlen); 96879 &address, addrlen);
96880 } 96880 }
@@ -96882,7 +96882,7 @@ index 9c467b2..f2cbd27 100644
96882 fput_light(sock->file, fput_needed); 96882 fput_light(sock->file, fput_needed);
96883 } 96883 }
96884 return err; 96884 return err;
96885@@ -1535,10 +1559,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) 96885@@ -1536,10 +1560,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
96886 if ((unsigned int)backlog > somaxconn) 96886 if ((unsigned int)backlog > somaxconn)
96887 backlog = somaxconn; 96887 backlog = somaxconn;
96888 96888
@@ -96903,7 +96903,7 @@ index 9c467b2..f2cbd27 100644
96903 fput_light(sock->file, fput_needed); 96903 fput_light(sock->file, fput_needed);
96904 } 96904 }
96905 return err; 96905 return err;
96906@@ -1582,6 +1616,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, 96906@@ -1583,6 +1617,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
96907 newsock->type = sock->type; 96907 newsock->type = sock->type;
96908 newsock->ops = sock->ops; 96908 newsock->ops = sock->ops;
96909 96909
@@ -96922,7 +96922,7 @@ index 9c467b2..f2cbd27 100644
96922 /* 96922 /*
96923 * We don't need try_module_get here, as the listening socket (sock) 96923 * We don't need try_module_get here, as the listening socket (sock)
96924 * has the protocol module (sock->ops->owner) held. 96924 * has the protocol module (sock->ops->owner) held.
96925@@ -1627,6 +1673,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, 96925@@ -1628,6 +1674,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
96926 fd_install(newfd, newfile); 96926 fd_install(newfd, newfile);
96927 err = newfd; 96927 err = newfd;
96928 96928
@@ -96931,7 +96931,7 @@ index 9c467b2..f2cbd27 100644
96931 out_put: 96931 out_put:
96932 fput_light(sock->file, fput_needed); 96932 fput_light(sock->file, fput_needed);
96933 out: 96933 out:
96934@@ -1659,6 +1707,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, 96934@@ -1660,6 +1708,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
96935 int, addrlen) 96935 int, addrlen)
96936 { 96936 {
96937 struct socket *sock; 96937 struct socket *sock;
@@ -96939,7 +96939,7 @@ index 9c467b2..f2cbd27 100644
96939 struct sockaddr_storage address; 96939 struct sockaddr_storage address;
96940 int err, fput_needed; 96940 int err, fput_needed;
96941 96941
96942@@ -1669,6 +1718,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, 96942@@ -1670,6 +1719,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
96943 if (err < 0) 96943 if (err < 0)
96944 goto out_put; 96944 goto out_put;
96945 96945
@@ -96957,7 +96957,7 @@ index 9c467b2..f2cbd27 100644
96957 err = 96957 err =
96958 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 96958 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
96959 if (err) 96959 if (err)
96960@@ -1750,6 +1810,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr, 96960@@ -1751,6 +1811,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
96961 * the protocol. 96961 * the protocol.
96962 */ 96962 */
96963 96963
@@ -96966,7 +96966,7 @@ index 9c467b2..f2cbd27 100644
96966 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len, 96966 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
96967 unsigned int, flags, struct sockaddr __user *, addr, 96967 unsigned int, flags, struct sockaddr __user *, addr,
96968 int, addr_len) 96968 int, addr_len)
96969@@ -1816,7 +1878,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, 96969@@ -1817,7 +1879,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
96970 struct socket *sock; 96970 struct socket *sock;
96971 struct iovec iov; 96971 struct iovec iov;
96972 struct msghdr msg; 96972 struct msghdr msg;
@@ -96975,7 +96975,7 @@ index 9c467b2..f2cbd27 100644
96975 int err, err2; 96975 int err, err2;
96976 int fput_needed; 96976 int fput_needed;
96977 96977
96978@@ -2036,7 +2098,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, 96978@@ -2039,7 +2101,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
96979 * checking falls down on this. 96979 * checking falls down on this.
96980 */ 96980 */
96981 if (copy_from_user(ctl_buf, 96981 if (copy_from_user(ctl_buf,
@@ -96984,7 +96984,7 @@ index 9c467b2..f2cbd27 100644
96984 ctl_len)) 96984 ctl_len))
96985 goto out_freectl; 96985 goto out_freectl;
96986 msg_sys->msg_control = ctl_buf; 96986 msg_sys->msg_control = ctl_buf;
96987@@ -2187,7 +2249,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, 96987@@ -2190,7 +2252,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
96988 int err, total_len, len; 96988 int err, total_len, len;
96989 96989
96990 /* kernel mode address */ 96990 /* kernel mode address */
@@ -96993,16 +96993,16 @@ index 9c467b2..f2cbd27 100644
96993 96993
96994 /* user mode address pointers */ 96994 /* user mode address pointers */
96995 struct sockaddr __user *uaddr; 96995 struct sockaddr __user *uaddr;
96996@@ -2218,7 +2280,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, 96996@@ -2219,7 +2281,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
96997 * kernel msghdr to use the kernel address space) 96997 /* Save the user-mode address (verify_iovec will change the
96998 * kernel msghdr to use the kernel address space)
96998 */ 96999 */
96999
97000- uaddr = (__force void __user *)msg_sys->msg_name; 97000- uaddr = (__force void __user *)msg_sys->msg_name;
97001+ uaddr = (void __force_user *)msg_sys->msg_name; 97001+ uaddr = (void __force_user *)msg_sys->msg_name;
97002 uaddr_len = COMPAT_NAMELEN(msg); 97002 uaddr_len = COMPAT_NAMELEN(msg);
97003 if (MSG_CMSG_COMPAT & flags) { 97003 if (MSG_CMSG_COMPAT & flags)
97004 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE); 97004 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
97005@@ -2971,7 +3033,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd, 97005@@ -2975,7 +3037,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
97006 old_fs = get_fs(); 97006 old_fs = get_fs();
97007 set_fs(KERNEL_DS); 97007 set_fs(KERNEL_DS);
97008 err = dev_ioctl(net, cmd, 97008 err = dev_ioctl(net, cmd,
@@ -97011,7 +97011,7 @@ index 9c467b2..f2cbd27 100644
97011 set_fs(old_fs); 97011 set_fs(old_fs);
97012 97012
97013 return err; 97013 return err;
97014@@ -3080,7 +3142,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd, 97014@@ -3084,7 +3146,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
97015 97015
97016 old_fs = get_fs(); 97016 old_fs = get_fs();
97017 set_fs(KERNEL_DS); 97017 set_fs(KERNEL_DS);
@@ -97020,7 +97020,7 @@ index 9c467b2..f2cbd27 100644
97020 set_fs(old_fs); 97020 set_fs(old_fs);
97021 97021
97022 if (cmd == SIOCGIFMAP && !err) { 97022 if (cmd == SIOCGIFMAP && !err) {
97023@@ -3185,7 +3247,7 @@ static int routing_ioctl(struct net *net, struct socket *sock, 97023@@ -3189,7 +3251,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
97024 ret |= __get_user(rtdev, &(ur4->rt_dev)); 97024 ret |= __get_user(rtdev, &(ur4->rt_dev));
97025 if (rtdev) { 97025 if (rtdev) {
97026 ret |= copy_from_user(devname, compat_ptr(rtdev), 15); 97026 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
@@ -97029,7 +97029,7 @@ index 9c467b2..f2cbd27 100644
97029 devname[15] = 0; 97029 devname[15] = 0;
97030 } else 97030 } else
97031 r4.rt_dev = NULL; 97031 r4.rt_dev = NULL;
97032@@ -3411,8 +3473,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname, 97032@@ -3415,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
97033 int __user *uoptlen; 97033 int __user *uoptlen;
97034 int err; 97034 int err;
97035 97035
@@ -97040,7 +97040,7 @@ index 9c467b2..f2cbd27 100644
97040 97040
97041 set_fs(KERNEL_DS); 97041 set_fs(KERNEL_DS);
97042 if (level == SOL_SOCKET) 97042 if (level == SOL_SOCKET)
97043@@ -3432,7 +3494,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname, 97043@@ -3436,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
97044 char __user *uoptval; 97044 char __user *uoptval;
97045 int err; 97045 int err;
97046 97046
@@ -97401,7 +97401,7 @@ index 6b42d47..2ac24d5 100644
97401 97401
97402 sub->evt.event = htohl(event, sub->swap); 97402 sub->evt.event = htohl(event, sub->swap);
97403diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c 97403diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
97404index 0258072..fc6d46d 100644 97404index 8664ad0..afe30af 100644
97405--- a/net/unix/af_unix.c 97405--- a/net/unix/af_unix.c
97406+++ b/net/unix/af_unix.c 97406+++ b/net/unix/af_unix.c
97407@@ -783,6 +783,12 @@ static struct sock *unix_find_other(struct net *net, 97407@@ -783,6 +783,12 @@ static struct sock *unix_find_other(struct net *net,
@@ -97450,7 +97450,7 @@ index 0258072..fc6d46d 100644
97450 done_path_create(&path, dentry); 97450 done_path_create(&path, dentry);
97451 return err; 97451 return err;
97452 } 97452 }
97453@@ -2334,9 +2353,13 @@ static int unix_seq_show(struct seq_file *seq, void *v) 97453@@ -2329,9 +2348,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
97454 seq_puts(seq, "Num RefCount Protocol Flags Type St " 97454 seq_puts(seq, "Num RefCount Protocol Flags Type St "
97455 "Inode Path\n"); 97455 "Inode Path\n");
97456 else { 97456 else {
@@ -97465,7 +97465,7 @@ index 0258072..fc6d46d 100644
97465 97465
97466 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu", 97466 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
97467 s, 97467 s,
97468@@ -2363,8 +2386,10 @@ static int unix_seq_show(struct seq_file *seq, void *v) 97468@@ -2358,8 +2381,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
97469 } 97469 }
97470 for ( ; i < len; i++) 97470 for ( ; i < len; i++)
97471 seq_putc(seq, u->addr->name->sun_path[i]); 97471 seq_putc(seq, u->addr->name->sun_path[i]);
@@ -97492,7 +97492,7 @@ index 8800604..0526440 100644
97492 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL); 97492 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
97493 if (table == NULL) 97493 if (table == NULL)
97494diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c 97494diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
97495index 3f77f42..662d89b 100644 97495index 9b88693..e35cadb 100644
97496--- a/net/vmw_vsock/af_vsock.c 97496--- a/net/vmw_vsock/af_vsock.c
97497+++ b/net/vmw_vsock/af_vsock.c 97497+++ b/net/vmw_vsock/af_vsock.c
97498@@ -335,7 +335,7 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)) 97498@@ -335,7 +335,7 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk))
© 2015 Mike Crute