From: Chuck Anderson Date: Wed, 18 Jan 2017 23:01:44 +0000 (-0800) Subject: Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux... X-Git-Tag: v4.1.12-92~24 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7444d44c3b7b60b4ae1122670c043b82d5629093;p=users%2Fjedix%2Flinux-maple.git Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1 * topic/uek-4.1/upstream-cherry-picks: (113 commits) packet: fix race condition in packet_set_ring net: avoid signed overflows for SO_{SND|RCV}BUFFORCE ALSA: pcm : Call kill_fasync() in stream lock netlink: Fix dump skb leak/double free rcu: Fix soft lockup for rcu_nocb_kthread mpi: Fix NULL ptr dereference in mpi_powm() [ver #3] sctp: validate chunk len before actually using it kvm: raise KVM_SOFT_MAX_VCPUS to support more vcpus netfilter: nfnetlink: fix splat due to incorrect socket memory accounting in skbuff clones netfilter: nfnetlink: avoid recurrent netns lookups in call_batch netfilter: nf_tables: fix wrong destroy anonymous sets if binding fails netfilter: nf_tables: use reverse traversal commit_list in nf_tables_abort ixgbevf: Handle previously-freed msix_entries PCI: pciehp: Prioritize data-link event over presence detect PCI: pciehp: Leave power indicator on when enabling already-enabled slot net: Fix use after free in the recvmmsg exit path signals: avoid unnecessary taking of sighand->siglock audit: fix a double fetch in audit_log_single_execve_arg() KEYS: Fix short sprintf buffer in /proc/keys show function tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT ... --- 7444d44c3b7b60b4ae1122670c043b82d5629093 diff --cc net/netlink/af_netlink.c index 9bb0fab02d5a8,0ee6712e4094e..f5bb0f8d460e0 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@@ -2664,8 -2628,8 +2664,9 @@@ static int netlink_dump(struct sock *sk struct netlink_callback *cb; struct sk_buff *skb = NULL; struct nlmsghdr *nlh; + struct module *module; int len, err = -ENOBUFS; + int alloc_min_size; int alloc_size; mutex_lock(nlk->cb_mutex);