Linus Torvalds 52b9c81680 Merge branch 'apw' (xfrm_user fixes) ... Merge xfrm_user validation fixes from Andy Whitcroft: "Two patches we are applying to Ubuntu for XFRM_MSG_NEWAE validation issue reported by ZDI. The first of these is the primary fix, and the second is for a more theoretical issue that Kees pointed out when reviewing the first" * emailed patches from Andy Whitcroft <apw@canonical.com>: xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window		2017-03-29 13:26:22 -07:00
..
6lowpan	6lowpan: use rb_entry()	2017-01-22 16:46:13 -05:00
9p	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-03-03 21:44:35 -08:00
802	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
8021q	net: remove ndo_neigh_{construct, destroy} from stacked devices	2017-02-06 11:25:57 -05:00
appletalk	lib/vsprintf.c: remove %Z support	2017-02-27 18:43:47 -08:00
atm	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
ax25	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
batman-adv	Here are two batman-adv bugfixes:	2017-03-16 12:05:38 -07:00
bluetooth	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
bridge	bridge: resolve a false alarm of lockdep	2017-03-16 21:29:20 -07:00
caif	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>	2017-03-02 08:42:29 +01:00
can	can: bcm: fix hrtimer/tasklet termination in bcm op removal	2017-01-30 11:05:04 +01:00
ceph	libceph: force GFP_NOIO for socket allocations	2017-03-23 12:03:36 +01:00
core	socket, bpf: fix sk_filter use after free in sk_clone_lock	2017-03-22 15:37:04 -07:00
dcb	net: dcb: set error code on failures	2016-12-03 23:54:25 -05:00
dccp	dccp: fix memory leak during tear-down of unsuccessful connection request	2017-03-13 22:00:42 -07:00
decnet	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
dns_resolver	Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-03-03 10:16:38 -08:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-11 02:31:11 -05:00
ethernet	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
hsr	net/hsr: use eth_hw_addr_random()	2017-02-21 13:25:22 -05:00
ieee802154	lib/vsprintf.c: remove %Z support	2017-02-27 18:43:47 -08:00
ife	net: Introduce ife encapsulation module	2017-02-03 15:16:45 -05:00
ipv4	inet: frag: release spinlock before calling icmp_send()	2017-03-22 15:40:45 -07:00
ipv6	ipv6: make sure to initialize sockc.tsflags before first use	2017-03-22 12:40:22 -07:00
ipx	ktime: Get rid of the union	2016-12-25 17:21:22 +01:00
irda	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
iucv	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
kcm	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
key	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-28 10:00:39 -08:00
l3mdev
lapb	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
llc	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-04 17:31:39 -08:00
mac802154	sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>	2017-03-02 08:42:38 +01:00
mpls	net: mpls: Fix nexthop alive tracking on down events	2017-03-16 20:22:18 -07:00
ncsi	net/ncsi: Improve HNCDSC AEN handler	2016-10-20 11:23:08 -04:00
netfilter	netfilter: nft_ct: do cleanup work when NFTA_CT_DIRECTION is invalid	2017-03-15 17:15:54 +01:00
netlabel	netlabel: add CALIPSO to the list of built-in protocols	2017-01-06 22:20:45 -05:00
netlink	genetlink: fix counting regression on ctrl_dumpfamily()	2017-03-22 15:38:43 -07:00
netrom	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
nfc	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
openvswitch	openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD	2017-03-16 11:59:46 -07:00
packet	net: don't call strlen() on the user buffer in packet_bind_spkt()	2017-03-01 20:55:57 -08:00
phonet	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
psample	net: Introduce psample, a new genetlink channel for packet sampling	2017-01-24 13:44:28 -05:00
qrtr	net: qrtr: Mark 'buf' as little endian	2017-01-10 20:45:04 -05:00
rds	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
rfkill	rfkill: remove rfkill-regulator	2017-01-24 11:07:35 +01:00
rose	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
rxrpc	rxrpc: Ignore BUSY packets on old calls	2017-03-16 21:27:57 -07:00
sched	sch_dsmark: fix invalid skb_cow() usage	2017-03-21 17:21:27 -07:00
sctp	sctp: remove useless err from sctp_association_init	2017-03-22 10:57:52 -07:00
smc	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
strparser	strparser: destroy workqueue on module exit	2017-03-03 20:43:26 -08:00
sunrpc	NFS client fixes for 4.11	2017-03-17 14:16:22 -07:00
switchdev	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
tipc	tipc: fix nametbl deadlock at tipc_nametbl_unsubscribe	2017-03-22 11:59:16 -07:00
unix	net: unix: properly re-increment inflight counter of GC discarded candidates	2017-03-21 15:25:10 -07:00
vmw_vsock	vsock: cancel packets when failing to connect	2017-03-21 14:41:47 -07:00
wimax	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
wireless	nl80211: fix dumpit error path RTNL deadlocks	2017-03-16 10:30:03 +01:00
x25	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
xfrm	Merge branch 'apw' (xfrm_user fixes)	2017-03-29 13:26:22 -07:00
compat.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-02-22 10:15:09 -08:00
Kconfig	bpf: make jited programs visible in traces	2017-02-17 13:40:05 -05:00
Makefile	net: Introduce ife encapsulation module	2017-02-03 15:16:45 -05:00
socket.c	tcp: mark skbs with SCM_TIMESTAMPING_OPT_STATS	2017-03-21 18:44:17 -07:00
sysctl_net.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2016-10-06 09:52:23 -07:00