Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:
 "Hopefully this is the last batch of networking fixes for 4.14

  Fingers crossed...

   1) Fix stmmac to use the proper sized OF property read, from Bhadram
      Varka.

   2) Fix use after free in net scheduler tc action code, from Cong
      Wang.

   3) Fix SKB control block mangling in tcp_make_synack().

   4) Use proper locking in fib_dump_info(), from Florian Westphal.

   5) Fix IPG encodings in systemport driver, from Florian Fainelli.

   6) Fix division by zero in NV TCP congestion control module, from
      Konstantin Khlebnikov.

   7) Fix use after free in nf_reject_ipv4, from Tejaswi Tanikella"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: systemport: Correct IPG length settings
  tcp: do not mangle skb->cb[] in tcp_make_synack()
  fib: fib_dump_info can no longer use __in_dev_get_rtnl
  stmmac: use of_property_read_u32 instead of read_u8
  net_sched: hold netns refcnt for each action
  net_sched: acquire RTNL in tc_action_net_exit()
  net: vrf: correct FRA_L3MDEV encode type
  tcp_nv: fix division by zero in tcpnv_acked()
  netfilter: nf_reject_ipv4: Fix use-after-free in send_reset
  netfilter: nft_set_hash: disable fast_ops for 2-len keys

3 files changed, 15 insertions, 13 deletions

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 83eec9a8c275..eb441e5e2cd8 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1809,15 +1809,17 @@ static inline void bcm_sysport_mask_all_intrs(struct bcm_sysport_priv *priv)
 
 static inline void gib_set_pad_extension(struct bcm_sysport_priv *priv)
 {
-        u32 __maybe_unused reg;
+        u32 reg;
 
-        /* Include Broadcom tag in pad extension */
+        reg = gib_readl(priv, GIB_CONTROL);
+        /* Include Broadcom tag in pad extension and fix up IPG_LENGTH */
         if (netdev_uses_dsa(priv->netdev)) {
-                reg = gib_readl(priv, GIB_CONTROL);
                 reg &= ~(GIB_PAD_EXTENSION_MASK << GIB_PAD_EXTENSION_SHIFT);
                 reg |= ENET_BRCM_TAG_LEN << GIB_PAD_EXTENSION_SHIFT;
-                gib_writel(priv, reg, GIB_CONTROL);
         }
+        reg &= ~(GIB_IPG_LEN_MASK << GIB_IPG_LEN_SHIFT);
+        reg |= 12 << GIB_IPG_LEN_SHIFT;
+        gib_writel(priv, reg, GIB_CONTROL);
 }
 
 static int bcm_sysport_open(struct net_device *dev)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 6383695004a5..195eb7e71473 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -168,8 +168,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
         }
 
         /* Processing RX queues common config */
-        if (of_property_read_u8(rx_node, "snps,rx-queues-to-use",
-                                &plat->rx_queues_to_use))
+        if (of_property_read_u32(rx_node, "snps,rx-queues-to-use",
+                                 &plat->rx_queues_to_use))
                 plat->rx_queues_to_use = 1;
 
         if (of_property_read_bool(rx_node, "snps,rx-sched-sp"))
@@ -191,8 +191,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
                 else
                         plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
 
-                if (of_property_read_u8(q_node, "snps,map-to-dma-channel",
-                                        &plat->rx_queues_cfg[queue].chan))
+                if (of_property_read_u32(q_node, "snps,map-to-dma-channel",
+                                         &plat->rx_queues_cfg[queue].chan))
                         plat->rx_queues_cfg[queue].chan = queue;
                 /* TODO: Dynamic mapping to be included in the future */
 
@@ -222,8 +222,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
         }
 
         /* Processing TX queues common config */
-        if (of_property_read_u8(tx_node, "snps,tx-queues-to-use",
-                                &plat->tx_queues_to_use))
+        if (of_property_read_u32(tx_node, "snps,tx-queues-to-use",
+                                 &plat->tx_queues_to_use))
                 plat->tx_queues_to_use = 1;
 
         if (of_property_read_bool(tx_node, "snps,tx-sched-wrr"))
@@ -244,8 +244,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
                 if (queue >= plat->tx_queues_to_use)
                         break;
 
-                if (of_property_read_u8(q_node, "snps,weight",
-                                        &plat->tx_queues_cfg[queue].weight))
+                if (of_property_read_u32(q_node, "snps,weight",
+                                         &plat->tx_queues_cfg[queue].weight))
                         plat->tx_queues_cfg[queue].weight = 0x10 + queue;
 
                 if (of_property_read_bool(q_node, "snps,dcb-algorithm")) {
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 9b243e6f3008..7dc3bcac3506 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -1165,7 +1165,7 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it)
         frh->family = family;
         frh->action = FR_ACT_TO_TBL;
 
-        if (nla_put_u32(skb, FRA_L3MDEV, 1))
+        if (nla_put_u8(skb, FRA_L3MDEV, 1))
                 goto nla_put_failure;
 
         if (nla_put_u32(skb, FRA_PRIORITY, FIB_RULE_PREF))