]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Wed, 18 Jan 2017 23:01:44 +0000 (15:01 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 18 Jan 2017 23:01:44 +0000 (15:01 -0800)
* 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
  ...

17 files changed:
1  2 
arch/x86/include/asm/kvm_host.h
arch/x86/include/uapi/asm/msr-index.h
crypto/algapi.c
crypto/testmgr.c
drivers/crypto/qat/qat_common/qat_algs.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/pci/hotplug/pciehp_hpc.c
include/linux/module.h
include/linux/netdevice.h
include/linux/signal.h
kernel/signal.c
net/core/sock.c
net/netfilter/nfnetlink.c
net/netlink/af_netlink.c
net/packet/af_packet.c
net/sctp/sm_statefuns.c
net/socket.c

Simple merge
Simple merge
diff --cc crypto/algapi.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/signal.c
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge
index 9bb0fab02d5a82ab696017fb3cc3b6bd30ddb426,0ee6712e4094e7fa658d47bb72561552a01f4c05..f5bb0f8d460e08e087ee572b9e36d18a5aea4ef1
@@@ -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);
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge