diff -druNp --no-dereference linux-libre-3.18.135-gnu/drivers/hwmon/lm80.c linux-libre-3.18.136-gnu/drivers/hwmon/lm80.c
--- linux-libre-3.18.135-gnu/drivers/hwmon/lm80.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/drivers/hwmon/lm80.c	2019-02-23 03:04:26.000000000 -0500
@@ -393,8 +393,10 @@ static ssize_t set_fan_div(struct device
 	}
 
 	rv = lm80_read_value(client, LM80_REG_FANDIV);
-	if (rv < 0)
+	if (rv < 0) {
+		mutex_unlock(&data->update_lock);
 		return rv;
+	}
 	reg = (rv & ~(3 << (2 * (nr + 1))))
 	    | (data->fan_div[nr] << (2 * (nr + 1)));
 	lm80_write_value(client, LM80_REG_FANDIV, reg);
diff -druNp --no-dereference linux-libre-3.18.135-gnu/drivers/isdn/mISDN/timerdev.c linux-libre-3.18.136-gnu/drivers/isdn/mISDN/timerdev.c
--- linux-libre-3.18.135-gnu/drivers/isdn/mISDN/timerdev.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/drivers/isdn/mISDN/timerdev.c	2019-02-23 03:04:26.000000000 -0500
@@ -168,8 +168,8 @@ dev_expire_timer(unsigned long data)
 	spin_lock_irqsave(&timer->dev->lock, flags);
 	if (timer->id >= 0)
 		list_move_tail(&timer->list, &timer->dev->expired);
-	spin_unlock_irqrestore(&timer->dev->lock, flags);
 	wake_up_interruptible(&timer->dev->wait);
+	spin_unlock_irqrestore(&timer->dev->lock, flags);
 }
 
 static int
diff -druNp --no-dereference linux-libre-3.18.135-gnu/drivers/net/ethernet/marvell/sky2.c linux-libre-3.18.136-gnu/drivers/net/ethernet/marvell/sky2.c
--- linux-libre-3.18.135-gnu/drivers/net/ethernet/marvell/sky2.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/drivers/net/ethernet/marvell/sky2.c	2019-02-23 03:04:26.000000000 -0500
@@ -5069,7 +5069,7 @@ static int sky2_probe(struct pci_dev *pd
 	INIT_WORK(&hw->restart_work, sky2_restart);
 
 	pci_set_drvdata(pdev, hw);
-	pdev->d3_delay = 200;
+	pdev->d3_delay = 300;
 
 	return 0;
 
diff -druNp --no-dereference linux-libre-3.18.135-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c linux-libre-3.18.136-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
--- linux-libre-3.18.135-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	2019-02-23 03:04:26.000000000 -0500
@@ -614,25 +614,27 @@ static int stmmac_ethtool_op_set_eee(str
 				     struct ethtool_eee *edata)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
+	int ret;
 
-	priv->eee_enabled = edata->eee_enabled;
-
-	if (!priv->eee_enabled)
+	if (!edata->eee_enabled) {
 		stmmac_disable_eee_mode(priv);
-	else {
+	} else {
 		/* We are asking for enabling the EEE but it is safe
 		 * to verify all by invoking the eee_init function.
 		 * In case of failure it will return an error.
 		 */
-		priv->eee_enabled = stmmac_eee_init(priv);
-		if (!priv->eee_enabled)
+		edata->eee_enabled = stmmac_eee_init(priv);
+		if (!edata->eee_enabled)
 			return -EOPNOTSUPP;
-
-		/* Do not change tx_lpi_timer in case of failure */
-		priv->tx_lpi_timer = edata->tx_lpi_timer;
 	}
 
-	return phy_ethtool_set_eee(priv->phydev, edata);
+	ret = phy_ethtool_set_eee(dev->phydev, edata);
+	if (ret)
+		return ret;
+
+	priv->eee_enabled = edata->eee_enabled;
+	priv->tx_lpi_timer = edata->tx_lpi_timer;
+	return 0;
 }
 
 static u32 stmmac_usec2riwt(u32 usec, struct stmmac_priv *priv)
diff -druNp --no-dereference linux-libre-3.18.135-gnu/drivers/net/vxlan.c linux-libre-3.18.136-gnu/drivers/net/vxlan.c
--- linux-libre-3.18.135-gnu/drivers/net/vxlan.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/drivers/net/vxlan.c	2019-02-23 03:04:26.000000000 -0500
@@ -1665,7 +1665,7 @@ static void vxlan_encap_bypass(struct sk
 	struct pcpu_sw_netstats *tx_stats, *rx_stats;
 	union vxlan_addr loopback;
 	union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
-	struct net_device *dev = skb->dev;
+	struct net_device *dev;
 	int len = skb->len;
 
 	tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
@@ -1685,8 +1685,15 @@ static void vxlan_encap_bypass(struct sk
 #endif
 	}
 
+	rcu_read_lock();
+	dev = skb->dev;
+	if (unlikely(!(dev->flags & IFF_UP))) {
+		kfree_skb(skb);
+		goto drop;
+	}
+
 	if (dst_vxlan->flags & VXLAN_F_LEARN)
-		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source);
+		vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source);
 
 	u64_stats_update_begin(&tx_stats->syncp);
 	tx_stats->tx_packets++;
@@ -1699,8 +1706,10 @@ static void vxlan_encap_bypass(struct sk
 		rx_stats->rx_bytes += len;
 		u64_stats_update_end(&rx_stats->syncp);
 	} else {
+drop:
 		dev->stats.rx_dropped++;
 	}
+	rcu_read_unlock();
 }
 
 static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
diff -druNp --no-dereference linux-libre-3.18.135-gnu/include/net/ax25.h linux-libre-3.18.136-gnu/include/net/ax25.h
--- linux-libre-3.18.135-gnu/include/net/ax25.h	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/include/net/ax25.h	2019-02-23 03:04:26.000000000 -0500
@@ -197,6 +197,18 @@ static inline void ax25_hold_route(ax25_
 
 void __ax25_put_route(ax25_route *ax25_rt);
 
+extern rwlock_t ax25_route_lock;
+
+static inline void ax25_route_lock_use(void)
+{
+	read_lock(&ax25_route_lock);
+}
+
+static inline void ax25_route_lock_unuse(void)
+{
+	read_unlock(&ax25_route_lock);
+}
+
 static inline void ax25_put_route(ax25_route *ax25_rt)
 {
 	if (atomic_dec_and_test(&ax25_rt->refcount))
diff -druNp --no-dereference linux-libre-3.18.135-gnu/include/net/inetpeer.h linux-libre-3.18.136-gnu/include/net/inetpeer.h
--- linux-libre-3.18.135-gnu/include/net/inetpeer.h	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/include/net/inetpeer.h	2019-02-23 03:04:26.000000000 -0500
@@ -35,6 +35,7 @@ struct inet_peer {
 
 	u32			metrics[RTAX_MAX];
 	u32			rate_tokens;	/* rate limiting for ICMP */
+	u32			n_redirects;
 	unsigned long		rate_last;
 	union {
 		struct list_head	gc_list;
diff -druNp --no-dereference linux-libre-3.18.135-gnu/include/net/tcp.h linux-libre-3.18.136-gnu/include/net/tcp.h
--- linux-libre-3.18.135-gnu/include/net/tcp.h	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/include/net/tcp.h	2019-02-23 03:04:26.000000000 -0500
@@ -1379,6 +1379,7 @@ static inline void tcp_write_queue_purge
 		sk_wmem_free_skb(sk, skb);
 	sk_mem_reclaim(sk);
 	tcp_clear_all_retrans_hints(tcp_sk(sk));
+	inet_csk(sk)->icsk_backoff = 0;
 }
 
 static inline struct sk_buff *tcp_write_queue_head(const struct sock *sk)
diff -druNp --no-dereference linux-libre-3.18.135-gnu/Makefile linux-libre-3.18.136-gnu/Makefile
--- linux-libre-3.18.135-gnu/Makefile	2019-02-20 18:48:28.000000000 -0500
+++ linux-libre-3.18.136-gnu/Makefile	2019-02-23 16:38:01.000000000 -0500
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 18
-SUBLEVEL = 135
+SUBLEVEL = 136
 EXTRAVERSION =-gnu
 NAME = Diseased Newt
 
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ax25/ax25_ip.c linux-libre-3.18.136-gnu/net/ax25/ax25_ip.c
--- linux-libre-3.18.135-gnu/net/ax25/ax25_ip.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ax25/ax25_ip.c	2019-02-23 03:04:26.000000000 -0500
@@ -118,6 +118,7 @@ int ax25_rebuild_header(struct sk_buff *
 	if (arp_find(bp + 1, skb))
 		return 1;
 
+	ax25_route_lock_use();
 	route = ax25_get_route(dst, NULL);
 	if (route) {
 		digipeat = route->digipeat;
@@ -209,9 +210,8 @@ int ax25_rebuild_header(struct sk_buff *
 	ax25_queue_xmit(skb, dev);
 
 put:
-	if (route)
-		ax25_put_route(route);
 
+	ax25_route_lock_unuse();
 	return 1;
 }
 
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ax25/ax25_route.c linux-libre-3.18.136-gnu/net/ax25/ax25_route.c
--- linux-libre-3.18.135-gnu/net/ax25/ax25_route.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ax25/ax25_route.c	2019-02-23 03:04:26.000000000 -0500
@@ -40,7 +40,7 @@
 #include <linux/export.h>
 
 static ax25_route *ax25_route_list;
-static DEFINE_RWLOCK(ax25_route_lock);
+DEFINE_RWLOCK(ax25_route_lock);
 
 void ax25_rt_device_down(struct net_device *dev)
 {
@@ -349,6 +349,7 @@ const struct file_operations ax25_route_
  *	Find AX.25 route
  *
  *	Only routes with a reference count of zero can be destroyed.
+ *	Must be called with ax25_route_lock read locked.
  */
 ax25_route *ax25_get_route(ax25_address *addr, struct net_device *dev)
 {
@@ -356,7 +357,6 @@ ax25_route *ax25_get_route(ax25_address
 	ax25_route *ax25_def_rt = NULL;
 	ax25_route *ax25_rt;
 
-	read_lock(&ax25_route_lock);
 	/*
 	 *	Bind to the physical interface we heard them on, or the default
 	 *	route if none is found;
@@ -379,11 +379,6 @@ ax25_route *ax25_get_route(ax25_address
 	if (ax25_spe_rt != NULL)
 		ax25_rt = ax25_spe_rt;
 
-	if (ax25_rt != NULL)
-		ax25_hold_route(ax25_rt);
-
-	read_unlock(&ax25_route_lock);
-
 	return ax25_rt;
 }
 
@@ -414,9 +409,12 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25
 	ax25_route *ax25_rt;
 	int err = 0;
 
-	if ((ax25_rt = ax25_get_route(addr, NULL)) == NULL)
+	ax25_route_lock_use();
+	ax25_rt = ax25_get_route(addr, NULL);
+	if (!ax25_rt) {
+		ax25_route_lock_unuse();
 		return -EHOSTUNREACH;
-
+	}
 	if ((ax25->ax25_dev = ax25_dev_ax25dev(ax25_rt->dev)) == NULL) {
 		err = -EHOSTUNREACH;
 		goto put;
@@ -451,8 +449,7 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25
 	}
 
 put:
-	ax25_put_route(ax25_rt);
-
+	ax25_route_lock_unuse();
 	return err;
 }
 
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ipv4/inetpeer.c linux-libre-3.18.136-gnu/net/ipv4/inetpeer.c
--- linux-libre-3.18.135-gnu/net/ipv4/inetpeer.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ipv4/inetpeer.c	2019-02-23 03:04:26.000000000 -0500
@@ -464,6 +464,7 @@ relookup:
 		atomic_set(&p->rid, 0);
 		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
 		p->rate_tokens = 0;
+		p->n_redirects = 0;
 		/* 60*HZ is arbitrary, but chosen enough high so that the first
 		 * calculation of tokens is at its maximum.
 		 */
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ipv4/route.c linux-libre-3.18.136-gnu/net/ipv4/route.c
--- linux-libre-3.18.135-gnu/net/ipv4/route.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ipv4/route.c	2019-02-23 03:04:26.000000000 -0500
@@ -864,13 +864,15 @@ void ip_rt_send_redirect(struct sk_buff
 	/* No redirected packets during ip_rt_redirect_silence;
 	 * reset the algorithm.
 	 */
-	if (time_after(jiffies, peer->rate_last + ip_rt_redirect_silence))
+	if (time_after(jiffies, peer->rate_last + ip_rt_redirect_silence)) {
 		peer->rate_tokens = 0;
+		peer->n_redirects = 0;
+	}
 
 	/* Too many ignored redirects; do not send anything
 	 * set dst.rate_last to the last seen redirected packet.
 	 */
-	if (peer->rate_tokens >= ip_rt_redirect_number) {
+	if (peer->n_redirects >= ip_rt_redirect_number) {
 		peer->rate_last = jiffies;
 		goto out_put_peer;
 	}
@@ -887,6 +889,7 @@ void ip_rt_send_redirect(struct sk_buff
 		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, gw);
 		peer->rate_last = jiffies;
 		++peer->rate_tokens;
+		++peer->n_redirects;
 #ifdef CONFIG_IP_ROUTE_VERBOSE
 		if (log_martians &&
 		    peer->rate_tokens == ip_rt_redirect_number)
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ipv4/tcp.c linux-libre-3.18.136-gnu/net/ipv4/tcp.c
--- linux-libre-3.18.135-gnu/net/ipv4/tcp.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ipv4/tcp.c	2019-02-23 03:04:26.000000000 -0500
@@ -2258,7 +2258,6 @@ int tcp_disconnect(struct sock *sk, int
 	tp->srtt_us = 0;
 	if ((tp->write_seq += tp->max_window + 2) == 0)
 		tp->write_seq = 1;
-	icsk->icsk_backoff = 0;
 	tp->snd_cwnd = 2;
 	icsk->icsk_probes_out = 0;
 	tp->packets_out = 0;
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ipv4/tcp_ipv4.c linux-libre-3.18.136-gnu/net/ipv4/tcp_ipv4.c
--- linux-libre-3.18.135-gnu/net/ipv4/tcp_ipv4.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ipv4/tcp_ipv4.c	2019-02-23 03:04:26.000000000 -0500
@@ -432,14 +432,15 @@ void tcp_v4_err(struct sk_buff *icmp_skb
 		if (sock_owned_by_user(sk))
 			break;
 
+		skb = tcp_write_queue_head(sk);
+		if (WARN_ON_ONCE(!skb))
+			break;
+
 		icsk->icsk_backoff--;
 		icsk->icsk_rto = tp->srtt_us ? __tcp_set_rto(tp) :
 					       TCP_TIMEOUT_INIT;
 		icsk->icsk_rto = inet_csk_rto_backoff(icsk, TCP_RTO_MAX);
 
-		skb = tcp_write_queue_head(sk);
-		BUG_ON(!skb);
-
 		remaining = icsk->icsk_rto -
 			    min(icsk->icsk_rto,
 				tcp_time_stamp - tcp_skb_timestamp(skb));
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/ipv6/addrconf.c linux-libre-3.18.136-gnu/net/ipv6/addrconf.c
--- linux-libre-3.18.135-gnu/net/ipv6/addrconf.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/ipv6/addrconf.c	2019-02-23 03:04:26.000000000 -0500
@@ -949,7 +949,8 @@ check_cleanup_prefix_route(struct inet6_
 	list_for_each_entry(ifa, &idev->addr_list, if_list) {
 		if (ifa == ifp)
 			continue;
-		if (!ipv6_prefix_equal(&ifa->addr, &ifp->addr,
+		if (ifa->prefix_len != ifp->prefix_len ||
+		    !ipv6_prefix_equal(&ifa->addr, &ifp->addr,
 				       ifp->prefix_len))
 			continue;
 		if (ifa->flags & (IFA_F_PERMANENT | IFA_F_NOPREFIXROUTE))
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/vmw_vsock/vmci_transport.c linux-libre-3.18.136-gnu/net/vmw_vsock/vmci_transport.c
--- linux-libre-3.18.135-gnu/net/vmw_vsock/vmci_transport.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/vmw_vsock/vmci_transport.c	2019-02-23 03:04:26.000000000 -0500
@@ -1663,6 +1663,10 @@ static int vmci_transport_socket_init(st
 
 static void vmci_transport_destruct(struct vsock_sock *vsk)
 {
+	/* transport can be NULL if we hit a failure at init() time */
+	if (!vmci_trans(vsk))
+		return;
+
 	if (vmci_trans(vsk)->attach_sub_id != VMCI_INVALID_ID) {
 		vmci_event_unsubscribe(vmci_trans(vsk)->attach_sub_id);
 		vmci_trans(vsk)->attach_sub_id = VMCI_INVALID_ID;
diff -druNp --no-dereference linux-libre-3.18.135-gnu/net/x25/af_x25.c linux-libre-3.18.136-gnu/net/x25/af_x25.c
--- linux-libre-3.18.135-gnu/net/x25/af_x25.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/net/x25/af_x25.c	2019-02-23 03:04:26.000000000 -0500
@@ -352,17 +352,15 @@ static unsigned int x25_new_lci(struct x
 	unsigned int lci = 1;
 	struct sock *sk;
 
-	read_lock_bh(&x25_list_lock);
-
-	while ((sk = __x25_find_socket(lci, nb)) != NULL) {
+	while ((sk = x25_find_socket(lci, nb)) != NULL) {
 		sock_put(sk);
 		if (++lci == 4096) {
 			lci = 0;
 			break;
 		}
+		cond_resched();
 	}
 
-	read_unlock_bh(&x25_list_lock);
 	return lci;
 }
 
diff -druNp --no-dereference linux-libre-3.18.135-gnu/virt/kvm/kvm_main.c linux-libre-3.18.136-gnu/virt/kvm/kvm_main.c
--- linux-libre-3.18.135-gnu/virt/kvm/kvm_main.c	2019-02-20 04:09:12.000000000 -0500
+++ linux-libre-3.18.136-gnu/virt/kvm/kvm_main.c	2019-02-23 03:04:26.000000000 -0500
@@ -2398,14 +2398,15 @@ static int kvm_ioctl_create_device(struc
 		return ret;
 	}
 
+	kvm_get_kvm(kvm);
 	ret = anon_inode_getfd(ops->name, &kvm_device_fops, dev, O_RDWR | O_CLOEXEC);
 	if (ret < 0) {
+		kvm_put_kvm(kvm);
 		ops->destroy(dev);
 		return ret;
 	}
 
 	list_add(&dev->vm_node, &kvm->devices);
-	kvm_get_kvm(kvm);
 	cd->fd = ret;
 	return 0;
 }
