Linux 5.0.13
Greg KH
maintainerI'm announcing the release of the 5.0.13 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/x86/include/uapi/asm/kvm.h | 1 arch/x86/kvm/vmx/nested.c | 4 - arch/x86/kvm/x86.c | 21 ++++++ drivers/net/dsa/bcm_sf2_cfp.c | 6 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 53 ++++++++++------ drivers/net/phy/marvell.c | 6 + drivers/net/wireless/ath/ath10k/mac.c | 4 - drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 5 + include/net/sctp/command.h | 1 net/ipv4/ip_output.c | 1 net/ipv4/tcp_ipv4.c | 13 +++- net/ipv4/udp_offload.c | 16 +++-- net/ipv6/ip6_fib.c | 4 - net/ipv6/ip6_flowlabel.c | 22 ++++-- net/ipv6/route.c | 47 ++++++-------- net/l2tp/l2tp_core.c | 10 +-- net/packet/af_packet.c | 37 +++++++---- net/rxrpc/call_object.c | 32 +++++----- net/sctp/sm_sideeffect.c | 29 --------- net/sctp/sm_statefuns.c | 35 ++++++++--- net/tls/tls_device.c | 39 ++++++++---- net/tls/tls_device_fallback.c | 3 sound/usb/line6/driver.c | 60 +++++++++++-------- sound/usb/line6/podhd.c | 21 +++--- sound/usb/line6/toneport.c | 24 +++++-- tools/testing/selftests/net/fib_rule_tests.sh | 10 ++- 27 files changed, 308 insertions(+), 198 deletions(-)
Andrew Lunn (1):
net: phy: marvell: Fix buffer overrun with stats counters
Dan Carpenter (1):
net: dsa: bcm_sf2: fix buffer overflow doing set_rxnfc
David Ahern (1):
selftests: fib_rule_tests: Fix icmp proto with ipv6
David Howells (1):
rxrpc: Fix net namespace cleanup
Eric Dumazet (6):
ipv6: fix races in ip6_dst_destroy()
ipv6/flowlabel: wait rcu grace period before put_pid()
l2ip: fix possible use-after-free
l2tp: use rcu_dereference_sk_user_data() in l2tp_udp_encap_recv()
tcp: add sanity tests in tcp_add_backlog()
udp: fix GRO packet of death
Greg Kroah-Hartman (3):
ALSA: line6: use dynamic buffers
iwlwifi: mvm: properly check debugfs dentry before using it Linux 5.0.13
Hangbin Liu (1):
selftests: fib_rule_tests: print the result and return 1 if any tests failed
Jakub Kicinski (3):
net/tls: avoid NULL pointer deref on nskb->sk in fallback net/tls: don't copy negative amounts of data in reencrypt net/tls: fix copy to fragments in reencrypt
Jim Mattson (1):
KVM: nVMX: Fix size checks in vmx_set_nested_state
Martin KaFai Lau (1):
ipv6: A few fixes on dereferencing rt->from
Michael Chan (5):
bnxt_en: Improve multicast address setup logic.
bnxt_en: Fix possible crash in bnxt_hwrm_ring_free() under error conditions.
bnxt_en: Pass correct extended TX port statistics size to firmware.
bnxt_en: Fix statistics context reservation logic.
bnxt_en: Fix uninitialized variable usage in bnxt_rx_pkt().
Paolo Abeni (1):
udp: fix GRO reception in case of length mismatch
Rafael J. Wysocki (1):
ath10k: Drop WARN_ON()s that always trigger during system resume
Sean Christopherson (1):
KVM: x86: Whitelist port 0x7e for pre-incrementing %rip
Shmulik Ladkani (1):
ipv4: ip_do_fragment: Preserve skb_iif during fragmentation
Vasundhara Volam (1):
bnxt_en: Free short FW command HWRM memory in error path in bnxt_init_one()
Willem de Bruijn (3):
ipv6: invert flowlabel sharing check in process and user mode
packet: validate msg_namelen in send directly
packet: in recvmsg msg_name return at least sizeof sockaddr_ll
Xin Long (1):
sctp: avoid running the sctp state machine recursively
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = Shy Crocodile
arch/x86/include/uapi/asm/kvm.h +1 -0
@@ -381,6 +381,7 @@ struct kvm_sync_regs {#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) +#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)#define KVM_STATE_NESTED_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
arch/x86/kvm/vmx/nested.c +2 -2
@@ -5407,7 +5407,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,return ret;/* Empty 'VMXON' state is permitted */ -if (kvm_state->size <sizeof (kvm_state) +sizeof (*vmcs12)) +if (kvm_state->size <sizeof (*kvm_state) +sizeof (*vmcs12))return 0 ;if (kvm_state->vmx.vmcs_pa !=-1ull ) {
@@ -5451,7 +5451,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, vmcs12->vmcs_link_pointer != -1ull) {struct vmcs12 *shadow_vmcs12 =get_shadow_vmcs12 (vcpu); -if (kvm_state->size <sizeof (kvm_state) +2 *sizeof (*vmcs12)) +if (kvm_state->size <sizeof (*kvm_state) +2 *sizeof (*vmcs12))return -EINVAL ; if (copy_from_user(shadow_vmcs12,
arch/x86/kvm/x86.c +19 -2
@@ -6536,6 +6536,12 @@ int kvm_emulate_instruction_from_buffer(struct kvm_vcpu *vcpu, }EXPORT_SYMBOL_GPL (kvm_emulate_instruction_from_buffer); +static int complete_fast_pio_out_port_0x7e (struct kvm_vcpu *vcpu) +{ + vcpu->arch.pio.count =0 ; +return 1 ; +} +static int complete_fast_pio_out (struct kvm_vcpu *vcpu) { vcpu->arch.pio.count =0 ;
@@ -6552,12 +6558,23 @@ static int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size,unsigned long val =kvm_register_read (vcpu,VCPU_REGS_RAX );int ret =emulator_pio_out_emulated (&vcpu->arch.emulate_ctxt, size, port, &val,1 ); +if (ret) +return ret; -if (!ret) { +/* +* Workaround userspace that relies on old KVM behavior of %rip being +* incremented prior to exiting to userspace to handle "OUT 0x7e". +*/ +if (port ==0x7e && +kvm_check_has_quirk (vcpu->kvm,KVM_X86_QUIRK_OUT_7E_INC_RIP )) { + vcpu->arch.complete_userspace_io = + complete_fast_pio_out_port_0x7e; +kvm_skip_emulated_instruction (vcpu); + }else { vcpu->arch.pio.linear_rip =kvm_get_linear_rip (vcpu); vcpu->arch.complete_userspace_io = complete_fast_pio_out; } -return ret; +return 0 ; }static int complete_fast_pio_in (struct kvm_vcpu *vcpu)
drivers/net/dsa/bcm_sf2_cfp.c +6 -0
@@ -854,6 +854,9 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, fs->m_ext.data[1]))return -EINVAL ; +if (fs->location !=RX_CLS_LOC_ANY && fs->location >=CFP_NUM_RULES ) +return -EINVAL ; +if (fs->location !=RX_CLS_LOC_ANY &&test_bit (fs->location, priv->cfp.used))return -EBUSY ;
@@ -942,6 +945,9 @@ static int bcm_sf2_cfp_rule_del(struct bcm_sf2_priv *priv, int port, u32 loc)struct cfp_rule *rule;int ret; +if (loc >=CFP_NUM_RULES ) +return -EINVAL ; +/* Refuse deleting unused rules, and those that are not unique since * that could leave IPv6 rules with one of the chained rule in the * table.
drivers/net/ethernet/broadcom/bnxt/bnxt.c +32 -21
145 lines not on this page · raw message
drivers/net/phy/marvell.c +4 -2
@@ -1494,9 +1494,10 @@ static int marvell_get_sset_count(struct phy_device *phydev)static void marvell_get_strings (struct phy_device *phydev,u8 *data) { +int count =marvell_get_sset_count (phydev);int i; -for (i =0 ; i <ARRAY_SIZE (marvell_hw_stats); i++) { +for (i =0 ; i < count; i++) {strlcpy (data + i *ETH_GSTRING_LEN , marvell_hw_stats[i].string,ETH_GSTRING_LEN ); }
@@ -1524,9 +1525,10 @@ static u64 marvell_get_stat(struct phy_device *phydev, int i)static void marvell_get_stats (struct phy_device *phydev,struct ethtool_stats *stats,u64 *data) { +int count =marvell_get_sset_count (phydev);int i; -for (i =0 ; i <ARRAY_SIZE (marvell_hw_stats); i++) +for (i =0 ; i < count; i++) data[i] =marvell_get_stat (phydev, i); }
drivers/net/wireless/ath/ath10k/mac.c +2 -2
@@ -5705,7 +5705,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, }if (changed &BSS_CHANGED_MCAST_RATE && - !WARN_ON (ath10k_mac_vif_chan (arvif->vif, &def))) { + !ath10k_mac_vif_chan (arvif->vif, &def)) { band = def.chan->band; rateidx = vif->bss_conf.mcast_rate[band] -1 ;
@@ -5743,7 +5743,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, }if (changed &BSS_CHANGED_BASIC_RATES ) { -if (WARN_ON (ath10k_mac_vif_chan (vif, &def))) { +if (ath10k_mac_vif_chan (vif, &def)) {mutex_unlock (&ar->conf_mutex);return ; }
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +5 -0
@@ -1482,6 +1482,11 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)return ; mvmvif->dbgfs_dir =debugfs_create_dir ("iwlmvm" , dbgfs_dir); +if (IS_ERR_OR_NULL (mvmvif->dbgfs_dir)) { +IWL_ERR (mvm,"Failed to create debugfs directory under %pd\n" , + dbgfs_dir); +return ; + }if (!mvmvif->dbgfs_dir) { IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
include/net/sctp/command.h +0 -1
@@ -105,7 +105,6 @@ enum sctp_verb {SCTP_CMD_T1_RETRAN ,/* Mark for retransmission after T1 timeout */ SCTP_CMD_UPDATE_INITTAG ,/* Update peer inittag */ SCTP_CMD_SEND_MSG ,/* Send the whole use message */ -SCTP_CMD_SEND_NEXT_ASCONF ,/* Send the next ASCONF after ACK */ SCTP_CMD_PURGE_ASCONF_QUEUE ,/* Purge all asconf queues.*/ SCTP_CMD_SET_ASOC ,/* Restore association context */ SCTP_CMD_LAST
net/ipv4/ip_output.c +1 -0
@@ -519,6 +519,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) to->pkt_type = from->pkt_type; to->priority = from->priority; to->protocol = from->protocol; + to->skb_iif = from->skb_iif;skb_dst_drop (to);skb_dst_copy (to, from); to->dev = from->dev;
net/ipv4/tcp_ipv4.c +12 -1
@@ -1673,7 +1673,9 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)if (TCP_SKB_CB (tail)->end_seq !=TCP_SKB_CB (skb)->seq ||TCP_SKB_CB (tail)->ip_dsfield !=TCP_SKB_CB (skb)->ip_dsfield || ((TCP_SKB_CB (tail)->tcp_flags | -TCP_SKB_CB (skb)->tcp_flags) &TCPHDR_URG ) || +TCP_SKB_CB (skb)->tcp_flags) & (TCPHDR_SYN |TCPHDR_RST |TCPHDR_URG )) || + !((TCP_SKB_CB (tail)->tcp_flags & +TCP_SKB_CB (skb)->tcp_flags) &TCPHDR_ACK ) || ((TCP_SKB_CB (tail)->tcp_flags ^TCP_SKB_CB (skb)->tcp_flags) & (TCPHDR_ECE |TCPHDR_CWR )) || #ifdef CONFIG_TLS_DEVICE
@@ -1692,6 +1694,15 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)if (after (TCP_SKB_CB (skb)->ack_seq,TCP_SKB_CB (tail)->ack_seq))TCP_SKB_CB (tail)->ack_seq =TCP_SKB_CB (skb)->ack_seq; +/* We have to update both TCP_SKB_CB(tail)->tcp_flags and +* thtail->fin, so that the fast path in tcp_rcv_established() +* is not entered if we append a packet with a FIN. +* SYN, RST, URG are not present. +* ACK is set on both packets. +* PSH : we do not really care in TCP stack, +* at least for 'GRO' packets. +*/ + thtail->fin |= th->fin;TCP_SKB_CB (tail)->tcp_flags |=TCP_SKB_CB (skb)->tcp_flags;if (TCP_SKB_CB (skb)->has_rxtstamp) {
net/ipv4/udp_offload.c +12 -4
@@ -352,6 +352,7 @@ static struct sk_buff *udp_gro_receive_segment(struct list_head *head,struct sk_buff *pp =NULL ;struct udphdr *uh2;struct sk_buff *p; +unsigned int ulen;/* requires non zero csum, for symmetry with GSO */ if (!uh->check) {
@@ -359,6 +360,12 @@ static struct sk_buff *udp_gro_receive_segment(struct list_head *head,return NULL ; } +/* Do not deal with padded or malicious packets, sorry ! */ + ulen =ntohs (uh->len); +if (ulen <=sizeof (*uh) || ulen !=skb_gro_len (skb)) { +NAPI_GRO_CB (skb)->flush =1 ; +return NULL ; + }/* pull encapsulating udp header */ skb_gro_pull (skb,sizeof (struct udphdr ));skb_gro_postpull_rcsum (skb, uh,sizeof (struct udphdr ));
@@ -377,13 +384,14 @@ static struct sk_buff *udp_gro_receive_segment(struct list_head *head,/* Terminate the flow on len mismatch or if it grow "too much". * Under small packet flood GRO count could elsewhere grow a lot -* leading to execessive truesize values +* leading to excessive truesize values. +* On len mismatch merge the first packet shorter than gso_size, +* otherwise complete the GRO packet. */ -if (!skb_gro_receive (p, skb) && +if (ulen >ntohs (uh2->len) ||skb_gro_receive (p, skb) || + ulen !=ntohs (uh2->len) ||NAPI_GRO_CB (p)->count >=UDP_GRO_CNT_MAX ) pp = p; -else if (uh->len != uh2->len) - pp = p;return pp; }
net/ipv6/ip6_fib.c +1 -3
@@ -921,9 +921,7 @@ static void fib6_drop_pcpu_from(struct fib6_info *f6i,if (pcpu_rt) {struct fib6_info *from; - from =rcu_dereference_protected (pcpu_rt->from, -lockdep_is_held (&table->tb6_lock)); -rcu_assign_pointer (pcpu_rt->from,NULL ); + from =xchg ((__force struct fib6_info **)&pcpu_rt->from,NULL );fib6_info_release (from); } }
net/ipv6/ip6_flowlabel.c +14 -8
@@ -94,15 +94,21 @@ static struct ip6_flowlabel *fl_lookup(struct net *net, __be32 label)return fl; } +static void fl_free_rcu (struct rcu_head *head) +{ + struct ip6_flowlabel *fl = container_of(head, struct ip6_flowlabel, rcu); + +if (fl->share ==IPV6_FL_S_PROCESS ) +put_pid (fl->owner.pid); +kfree (fl->opt); +kfree (fl); +} +static void fl_free (struct ip6_flowlabel *fl) { -if (fl) { -if (fl->share ==IPV6_FL_S_PROCESS ) -put_pid (fl->owner.pid); -kfree (fl->opt); -kfree_rcu (fl, rcu); - } +if (fl) +call_rcu (&fl->rcu, fl_free_rcu); }static void fl_release (struct ip6_flowlabel *fl)
@@ -633,9 +639,9 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)if (fl1->share ==IPV6_FL_S_EXCL || fl1->share != fl->share || ((fl1->share ==IPV6_FL_S_PROCESS ) && - (fl1->owner.pid == fl->owner.pid)) || + (fl1->owner.pid != fl->owner.pid)) || ((fl1->share ==IPV6_FL_S_USER ) && -uid_eq (fl1->owner.uid, fl->owner.uid))) + !uid_eq (fl1->owner.uid, fl->owner.uid))) goto release; err = -ENOMEM ;
net/ipv6/route.c +20 -27
84 lines not on this page · raw message
net/l2tp/l2tp_core.c +5 -5
@@ -169,8 +169,8 @@ struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id)rcu_read_lock_bh ();list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { -if (tunnel->tunnel_id == tunnel_id) { -l2tp_tunnel_inc_refcount (tunnel); +if (tunnel->tunnel_id == tunnel_id && +refcount_inc_not_zero (&tunnel->ref_count)) {rcu_read_unlock_bh ();return tunnel;
@@ -190,8 +190,8 @@ struct l2tp_tunnel *l2tp_tunnel_get_nth(const struct net *net, int nth)rcu_read_lock_bh ();list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { -if (++count > nth) { -l2tp_tunnel_inc_refcount (tunnel); +if (++count > nth && +refcount_inc_not_zero (&tunnel->ref_count)) {rcu_read_unlock_bh ();return tunnel; }
@@ -909,7 +909,7 @@ int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) {struct l2tp_tunnel *tunnel; - tunnel =l2tp_tunnel (sk); + tunnel =rcu_dereference_sk_user_data (sk);if (tunnel ==NULL ) goto pass_up;
net/packet/af_packet.c +25 -12
@@ -2603,8 +2603,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)void *ph; DECLARE_SOCKADDR(struct sockaddr_ll *, saddr, msg->msg_name);bool need_wait = !(msg->msg_flags &MSG_DONTWAIT ); +unsigned char *addr =NULL ;int tp_len, size_max; -unsigned char *addr;void *data;int len_sum =0 ;int status =TP_STATUS_AVAILABLE ;
@@ -2615,7 +2615,6 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)if (likely (saddr ==NULL )) { dev =packet_cached_dev_get (po); proto = po->num; - addr =NULL ; }else { err = -EINVAL ;if (msg->msg_namelen <sizeof (struct sockaddr_ll ))
@@ -2625,10 +2624,13 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) sll_addr))) goto out; proto = saddr->sll_protocol; - addr = saddr->sll_halen ? saddr->sll_addr :NULL ; dev =dev_get_by_index (sock_net (&po->sk), saddr->sll_ifindex); -if (addr && dev && saddr->sll_halen < dev->addr_len) - goto out_put; +if (po->sk.sk_socket->type ==SOCK_DGRAM ) { +if (dev && msg->msg_namelen < dev->addr_len + + offsetof(struct sockaddr_ll , sll_addr)) + goto out_put; + addr = saddr->sll_addr; + } } err = -ENXIO ;
@@ -2800,7 +2802,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)struct sk_buff *skb;struct net_device *dev;__be16 proto; -unsigned char *addr; +unsigned char *addr =NULL ;int err, reserve =0 ;struct sockcm_cookie sockc;struct virtio_net_hdr vnet_hdr = {0 };
@@ -2817,7 +2819,6 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)if (likely (saddr ==NULL )) { dev =packet_cached_dev_get (po); proto = po->num; - addr =NULL ; }else { err = -EINVAL ;if (msg->msg_namelen <sizeof (struct sockaddr_ll ))
@@ -2825,10 +2826,13 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll , sll_addr))) goto out; proto = saddr->sll_protocol; - addr = saddr->sll_halen ? saddr->sll_addr :NULL ; dev =dev_get_by_index (sock_net (sk), saddr->sll_ifindex); -if (addr && dev && saddr->sll_halen < dev->addr_len) - goto out_unlock; +if (sock->type ==SOCK_DGRAM ) { +if (dev && msg->msg_namelen < dev->addr_len + + offsetof(struct sockaddr_ll , sll_addr)) + goto out_unlock; + addr = saddr->sll_addr; + } } err = -ENXIO ;
@@ -3345,20 +3349,29 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { +int copy_len; +/* If the address length field is there to be filled * in, we fill it in now. */ if (sock->type ==SOCK_PACKET ) {__sockaddr_check_size (sizeof (struct sockaddr_pkt )); msg->msg_namelen =sizeof (struct sockaddr_pkt ); + copy_len = msg->msg_namelen; }else {struct sockaddr_ll *sll = &PACKET_SKB_CB (skb)->sa.ll; msg->msg_namelen = sll->sll_halen + offsetof(struct sockaddr_ll , sll_addr); + copy_len = msg->msg_namelen; +if (msg->msg_namelen <sizeof (struct sockaddr_ll )) { +memset (msg->msg_name + + offsetof(struct sockaddr_ll , sll_addr), +0 ,sizeof (sll->sll_addr)); + msg->msg_namelen =sizeof (struct sockaddr_ll ); + } } -memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, - msg->msg_namelen); +memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); }if (pkt_sk (sk)->auxdata) {
net/rxrpc/call_object.c +16 -16
@@ -604,30 +604,30 @@ void rxrpc_destroy_all_calls(struct rxrpc_net *rxnet)_enter ("" ); -if (list_empty (&rxnet->calls)) -return ; +if (!list_empty (&rxnet->calls)) { +write_lock (&rxnet->call_lock); -write_lock (&rxnet->call_lock); +while (!list_empty (&rxnet->calls)) { + call =list_entry (rxnet->calls.next, + struct rxrpc_call, link); +_debug ("Zapping call %p" , call); -while (!list_empty (&rxnet->calls)) { - call = list_entry(rxnet->calls.next, struct rxrpc_call, link); -_debug ("Zapping call %p" , call); +rxrpc_see_call (call); +list_del_init (&call->link); -rxrpc_see_call (call); -list_del_init (&call->link); +pr_err ("Call %p still in use (%d,%s,%lx,%lx)!\n" , + call,atomic_read (&call->usage), + rxrpc_call_states[call->state], + call->flags, call->events); -pr_err ("Call %p still in use (%d,%s,%lx,%lx)!\n" , - call,atomic_read (&call->usage), - rxrpc_call_states[call->state], - call->flags, call->events); +write_unlock (&rxnet->call_lock); +cond_resched (); +write_lock (&rxnet->call_lock); + }write_unlock (&rxnet->call_lock); -cond_resched (); -write_lock (&rxnet->call_lock); } -write_unlock (&rxnet->call_lock); -atomic_dec (&rxnet->nr_calls);wait_var_event (&rxnet->nr_calls, !atomic_read (&rxnet->nr_calls)); }
net/sctp/sm_sideeffect.c +0 -29
@@ -1112,32 +1112,6 @@ static void sctp_cmd_send_msg(struct sctp_association *asoc, } -/* Sent the next ASCONF packet currently stored in the association. -* This happens after the ASCONF_ACK was succeffully processed. -*/ -static void sctp_cmd_send_asconf (struct sctp_association *asoc) -{ -struct net *net =sock_net (asoc->base.sk); - -/* Send the next asconf chunk from the addip chunk -* queue. -*/ -if (!list_empty (&asoc->addip_chunk_list)) { -struct list_head *entry = asoc->addip_chunk_list.next; -struct sctp_chunk *asconf =list_entry (entry, - struct sctp_chunk, list); -list_del_init (entry); - -/* Hold the chunk until an ASCONF_ACK is received. */ -sctp_chunk_hold (asconf); -if (sctp_primitive_ASCONF (net, asoc, asconf)) -sctp_chunk_free (asconf); -else - asoc->addip_last_asconf = asconf; - } -} - -/* These three macros allow us to pull the debugging code out of the * main flow of sctp_do_sm() to keep attention focused on the real * functionality there.
@@ -1783,9 +1757,6 @@ static int sctp_cmd_interpreter(enum sctp_event_type event_type, }sctp_cmd_send_msg (asoc, cmd->obj.msg, gfp);break ; -case SCTP_CMD_SEND_NEXT_ASCONF : -sctp_cmd_send_asconf (asoc); -break ;case SCTP_CMD_PURGE_ASCONF_QUEUE :sctp_asconf_queue_teardown (asoc);break ;
net/sctp/sm_statefuns.c +27 -8
@@ -3824,6 +3824,29 @@ enum sctp_disposition sctp_sf_do_asconf(struct net *net,return SCTP_DISPOSITION_CONSUME ; } +static enum sctp_disposition sctp_send_next_asconf ( +struct net *net, +const struct sctp_endpoint *ep, +struct sctp_association *asoc, +const union sctp_subtype type, +struct sctp_cmd_seq *commands) +{ +struct sctp_chunk *asconf; +struct list_head *entry; + +if (list_empty (&asoc->addip_chunk_list)) +return SCTP_DISPOSITION_CONSUME ; + + entry = asoc->addip_chunk_list.next; + asconf = list_entry(entry, struct sctp_chunk, list); + +list_del_init (entry); +sctp_chunk_hold (asconf); + asoc->addip_last_asconf = asconf; + +return sctp_sf_do_prm_asconf (net, ep, asoc, type, asconf, commands); +} +/* * ADDIP Section 4.3 General rules for address manipulation * When building TLV parameters for the ASCONF Chunk that will add or
@@ -3915,14 +3938,10 @@ enum sctp_disposition sctp_sf_do_asconf_ack(struct net *net, SCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO));if (!sctp_process_asconf_ack ((struct sctp_association *)asoc, - asconf_ack)) { -/* Successfully processed ASCONF_ACK. We can -* release the next asconf if we have one. -*/ -sctp_add_cmd_sf (commands,SCTP_CMD_SEND_NEXT_ASCONF , -SCTP_NULL ()); -return SCTP_DISPOSITION_CONSUME ; - } + asconf_ack)) +return sctp_send_next_asconf (net, ep, + (struct sctp_association *)asoc, + type, commands); abort =sctp_make_abort (asoc, asconf_ack,sizeof (struct sctp_errhdr ));
net/tls/tls_device.c +28 -11
@@ -579,7 +579,7 @@ void handle_device_resync(struct sock *sk, u32 seq, u64 rcd_sn)static int tls_device_reencrypt (struct sock *sk,struct sk_buff *skb) {struct strp_msg *rxm =strp_msg (skb); -int err =0 , offset = rxm->offset, copy, nsg; +int err =0 , offset = rxm->offset, copy, nsg, data_len, pos;struct sk_buff *skb_iter, *unused;struct scatterlist sg[1 ];char *orig_buf, *buf;
@@ -610,25 +610,42 @@ static int tls_device_reencrypt(struct sock *sk, struct sk_buff *skb)else err =0 ; - copy =min_t (int,skb_pagelen (skb) - offset, - rxm->full_len -TLS_CIPHER_AES_GCM_128_TAG_SIZE ); + data_len = rxm->full_len -TLS_CIPHER_AES_GCM_128_TAG_SIZE ; -if (skb->decrypted) -skb_store_bits (skb, offset, buf, copy); +if (skb_pagelen (skb) > offset) { + copy =min_t (int,skb_pagelen (skb) - offset, data_len); - offset += copy; - buf += copy; +if (skb->decrypted) +skb_store_bits (skb, offset, buf, copy); + offset += copy; + buf += copy; + } + + pos =skb_pagelen (skb); skb_walk_frags(skb, skb_iter) { - copy =min_t (int, skb_iter->len, - rxm->full_len - offset + rxm->offset - -TLS_CIPHER_AES_GCM_128_TAG_SIZE ); +int frag_pos; + +/* Practically all frags must belong to msg if reencrypt +* is needed with current strparser and coalescing logic, +* but strparser may "get optimized", so let's be safe. +*/ +if (pos + skb_iter->len <= offset) + goto done_with_frag; +if (pos >= data_len + rxm->offset) +break ; + + frag_pos = offset - pos; + copy =min_t (int, skb_iter->len - frag_pos, + data_len + rxm->offset - offset);if (skb_iter->decrypted) -skb_store_bits (skb_iter, offset, buf, copy); +skb_store_bits (skb_iter, frag_pos, buf, copy); offset += copy; buf += copy; +done_with_frag: + pos += skb_iter->len; } free_buf:
net/tls/tls_device_fallback.c +2 -1
@@ -200,13 +200,14 @@ static void complete_skb(struct sk_buff *nskb, struct sk_buff *skb, int headln)skb_put (nskb, skb->len);memcpy (nskb->data, skb->data, headln); -update_chksum (nskb, headln); nskb->destructor = skb->destructor; nskb->sk = sk; skb->destructor =NULL ; skb->sk =NULL ; +update_chksum (nskb, headln); + delta = nskb->truesize - skb->truesize;if (likely (delta <0 ))WARN_ON_ONCE (refcount_sub_and_test (-delta, &sk->sk_wmem_alloc));
sound/usb/line6/driver.c +35 -25
141 lines not on this page · raw message
sound/usb/line6/podhd.c +12 -9
@@ -225,28 +225,32 @@ static void podhd_startup_start_workqueue(struct timer_list *t)static int podhd_dev_start (struct usb_line6_podhd *pod) {int ret; -u8 init_bytes[8 ]; +u8 *init_bytes;int i;struct usb_device *usbdev = pod->line6.usbdev; + init_bytes =kmalloc (8 ,GFP_KERNEL ); +if (!init_bytes) +return -ENOMEM ; + ret =usb_control_msg (usbdev,usb_sndctrlpipe (usbdev,0 ),0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ,0x11 ,0 ,NULL ,0 ,LINE6_TIMEOUT *HZ );if (ret <0 ) {dev_err (pod->line6.ifcdev,"read request failed (error %d)\n" , ret); -return ret; + goto exit; }/* NOTE: looks like some kind of ping message */ ret =usb_control_msg (usbdev,usb_rcvctrlpipe (usbdev,0 ),0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x11 ,0x0 , - &init_bytes,3 ,LINE6_TIMEOUT *HZ ); + init_bytes,3 ,LINE6_TIMEOUT *HZ );if (ret <0 ) {dev_err (pod->line6.ifcdev,"receive length failed (error %d)\n" , ret); -return ret; + goto exit; } pod->firmware_version =
@@ -255,7 +259,7 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)for (i =0 ; i <=16 ; i++) { ret =line6_read_data (&pod->line6,0xf000 +0x08 * i, init_bytes,8 );if (ret <0 ) -return ret; + goto exit; } ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
@@ -263,10 +267,9 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)USB_TYPE_STANDARD |USB_RECIP_DEVICE |USB_DIR_OUT ,1 ,0 , NULL, 0, LINE6_TIMEOUT * HZ); -if (ret <0 ) -return ret; - -return 0 ; +exit: +kfree (init_bytes); +return ret; }static void podhd_startup_workqueue (struct work_struct *work)
sound/usb/line6/toneport.c +18 -6
@@ -365,16 +365,21 @@ static bool toneport_has_source_select(struct usb_line6_toneport *toneport)/* Setup Toneport device. */ -static void toneport_setup (struct usb_line6_toneport *toneport) +static int toneport_setup (struct usb_line6_toneport *toneport) { -u32 ticks; +u32 *ticks;struct usb_line6 *line6 = &toneport->line6;struct usb_device *usbdev = line6->usbdev; + ticks =kmalloc (sizeof (*ticks),GFP_KERNEL ); +if (!ticks) +return -ENOMEM ; +/* sync time on device with host: */ /* note: 32-bit timestamps overflow in year 2106 */ - ticks = (u32 )ktime_get_real_seconds (); -line6_write_data (line6,0x80c6 , &ticks,4 ); + *ticks = (u32 )ktime_get_real_seconds (); +line6_write_data (line6,0x80c6 , ticks,4 ); +kfree (ticks);/* enable device: */ toneport_send_cmd (usbdev,0x0301 ,0x0000 );
@@ -389,6 +394,7 @@ static void toneport_setup(struct usb_line6_toneport *toneport)toneport_update_led (toneport);mod_timer (&toneport->timer, jiffies +TONEPORT_PCM_DELAY *HZ ); +return 0 ; }/*
@@ -451,7 +457,9 @@ static int toneport_init(struct usb_line6 *line6,return err; } -toneport_setup (toneport); + err =toneport_setup (toneport); +if (err) +return err;/* register audio system: */ return snd_card_register (line6->card);
@@ -463,7 +471,11 @@ static int toneport_init(struct usb_line6 *line6,*/ static int toneport_reset_resume (struct usb_interface *interface) { -toneport_setup (usb_get_intfdata (interface)); +int err; + + err =toneport_setup (usb_get_intfdata (interface)); +if (err) +return err;return line6_resume (interface); }#endif
tools/testing/selftests/net/fib_rule_tests.sh +8 -2
@@ -27,6 +27,7 @@ log_test() nsuccess=$((nsuccess+1)) printf "\n TEST: %-50s [ OK ]\n" "${msg}" else + ret=1 nfail=$((nfail+1)) printf "\n TEST: %-50s [FAIL]\n" "${msg}" if [ "${PAUSE_ON_FAIL}" = "yes" ]; then
@@ -147,8 +148,8 @@ fib_rule6_test() fib_check_iproute_support "ipproto" "ipproto" if [ $? -eq 0 ]; then - match="ipproto icmp" - fib_rule6_test_match_n_redirect "$match" "$match" "ipproto icmp match" + match="ipproto ipv6-icmp" + fib_rule6_test_match_n_redirect "$match" "$match" "ipproto ipv6-icmp match" fi }
@@ -245,4 +246,9 @@ setup run_fibrule_tests cleanup +if [ "$TESTS" != "none" ]; then + printf "\nTests passed: %3d\n" ${nsuccess} + printf "Tests failed: %3d\n" ${nfail} +fi + exit $ret
Thanks, a bunch man!
Quoted 113 lines · Greg KH
I'm announcing the release of the 5.0.13 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-5.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/x86/include/uapi/asm/kvm.h | 1 arch/x86/kvm/vmx/nested.c | 4 - arch/x86/kvm/x86.c | 21 ++++++ drivers/net/dsa/bcm_sf2_cfp.c | 6 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 53 ++++++++++------ drivers/net/phy/marvell.c | 6 + drivers/net/wireless/ath/ath10k/mac.c | 4 - drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 5 + include/net/sctp/command.h | 1 net/ipv4/ip_output.c | 1 net/ipv4/tcp_ipv4.c | 13 +++- net/ipv4/udp_offload.c | 16 +++-- net/ipv6/ip6_fib.c | 4 - net/ipv6/ip6_flowlabel.c | 22 ++++-- net/ipv6/route.c | 47 ++++++-------- net/l2tp/l2tp_core.c | 10 +-- net/packet/af_packet.c | 37 +++++++---- net/rxrpc/call_object.c | 32 +++++----- net/sctp/sm_sideeffect.c | 29 --------- net/sctp/sm_statefuns.c | 35 ++++++++--- net/tls/tls_device.c | 39 ++++++++---- net/tls/tls_device_fallback.c | 3 sound/usb/line6/driver.c | 60 +++++++++++-------- sound/usb/line6/podhd.c | 21 +++--- sound/usb/line6/toneport.c | 24 +++++-- tools/testing/selftests/net/fib_rule_tests.sh | 10 ++- 27 files changed, 308 insertions(+), 198 deletions(-)Andrew Lunn (1):
net: phy: marvell: Fix buffer overrun with stats countersDan Carpenter (1):
net: dsa:bcm_sf2: fix buffer overflow doingset_rxnfcDavid Ahern (1):
selftests:fib_rule_tests: Fix icmp proto with ipv6David Howells (1):
rxrpc: Fix net namespace cleanupEric Dumazet (6):
ipv6: fix races inip6_dst_destroy()
ipv6/flowlabel: wait rcu grace period beforeput_pid()
l2ip: fix possible use-after-free
l2tp: usercu_dereference_sk_user_data()inl2tp_udp_encap_recv()
tcp: add sanity tests intcp_add_backlog()
udp: fix GRO packet of deathGreg Kroah-Hartman (3):
ALSA: line6: use dynamic buffers
iwlwifi: mvm: properly check debugfs dentry before using it Linux 5.0.13Hangbin Liu (1):
selftests:fib_rule_tests: print the result and return 1 if any tests failedJakub Kicinski (3):
net/tls: avoid NULL pointer deref onnskb->skin fallback net/tls: don't copy negative amounts of data in reencrypt net/tls: fix copy to fragments in reencryptJim Mattson (1):
KVM: nVMX: Fix size checks invmx_set_nested_stateMartin KaFai Lau (1):
ipv6: A few fixes on dereferencing rt->fromMichael Chan (5):
bnxt_en: Improve multicast address setup logic.
bnxt_en: Fix possible crash inbnxt_hwrm_ring_free()under error conditions.
bnxt_en: Pass correct extended TX port statistics size to firmware.
bnxt_en: Fix statistics context reservation logic.
bnxt_en: Fix uninitialized variable usage inbnxt_rx_pkt().Paolo Abeni (1):
udp: fix GRO reception in case of length mismatchRafael J. Wysocki (1):
ath10k: Drop WARN_ON()s that always trigger during system resumeSean Christopherson (1):
KVM: x86: Whitelist port 0x7e for pre-incrementing %ripShmulik Ladkani (1):
ipv4:ip_do_fragment: Preserveskb_iifduring fragmentationVasundhara Volam (1):
bnxt_en: Free short FW command HWRM memory in error path inbnxt_init_one()Willem de Bruijn (3):
ipv6: invert flowlabel sharing check in process and user mode
packet: validatemsg_namelenin send directly
packet: in recvmsgmsg_namereturn at least sizeofsockaddr_llXin Long (1):
sctp: avoid running the sctp state machine recursively