Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1572613 > unrolled thread

[PATCH 4.4 00/20] 4.4.47-stable review

Started byGreg Kroah-Hartman <gregkh@linuxfoundation.org>
First post2017-02-02 19:40 +0100
Last post2017-02-03 06:20 +0100
Articles 11 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 4.4 00/20] 4.4.47-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 15/20] tcp: initialize max window for a new fastopen socket Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 12/20] net: fix harmonize_features() vs NETIF_F_HIGHDMA Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 02/20] mlxsw: spectrum: Fix memory leak at skb reallocation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 20/20] net: dsa: Bring back device detaching in dsa_slave_suspend() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 05/20] net: lwtunnel: Handle lwtunnel_fill_encap failure Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 14/20] ipv6: addrconf: Avoid addrconf_disable_change() using RCU read-side lock Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 13/20] net: phy: bcm63xx: Utilize correct config_intr function Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    [PATCH 4.4 06/20] net: ipv4: fix table id in getroute response Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-02-02 19:40 +0100
    Re: [PATCH 4.4 00/20] 4.4.47-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-02-02 21:40 +0100
    Re: [PATCH 4.4 00/20] 4.4.47-stable review Guenter Roeck <linux@roeck-us.net> - 2017-02-03 06:20 +0100

#1572613 — [PATCH 4.4 00/20] 4.4.47-stable review

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 00/20] 4.4.47-stable review
Message-ID<t6usy-7Bs-13@gated-at.bofh.it>
This is the start of the stable review cycle for the 4.4.47 release.
There are 20 patches in this series, all will be posted as a response
to this one.  If anyone has any issues with these being applied, please
let me know.

Responses should be made by Sat Feb  4 18:32:49 UTC 2017.
Anything received after that time might be too late.

The whole patch series can be found in one patch at:
	kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.47-rc1.gz
or in the git tree and branch at:
  git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.

thanks,

greg k-h

-------------
Pseudo-Shortlog of commits:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Linux 4.4.47-rc1

Florian Fainelli <f.fainelli@gmail.com>
    net: dsa: Bring back device detaching in dsa_slave_suspend()

Bjørn Mork <bjorn@mork.no>
    qmi_wwan/cdc_ether: add device ID for HP lt2523 (Novatel E371) WWAN card

WANG Cong <xiyou.wangcong@gmail.com>
    af_unix: move unix_mknod() out of bindlock

hayeswang <hayeswang@realtek.com>
    r8152: don't execute runtime suspend if the tx is not empty

Ivan Vecera <cera@cera.cz>
    bridge: netlink: call br_changelink() during br_dev_newlink()

Alexey Kodanev <alexey.kodanev@oracle.com>
    tcp: initialize max window for a new fastopen socket

Kefeng Wang <wangkefeng.wang@huawei.com>
    ipv6: addrconf: Avoid addrconf_disable_change() using RCU read-side lock

Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>
    net: phy: bcm63xx: Utilize correct config_intr function

Eric Dumazet <edumazet@google.com>
    net: fix harmonize_features() vs NETIF_F_HIGHDMA

Basil Gunn <basil@pacabunga.com>
    ax25: Fix segfault after sock connection timeout

Masaru Nagai <masaru.nagai.vx@renesas.com>
    ravb: do not use zero-length alignment DMA descriptor

Lance Richardson <lrichard@redhat.com>
    openvswitch: maintain correct checksum state in conntrack actions

Shannon Nelson <shannon.nelson@oracle.com>
    tcp: fix tcp_fastopen unaligned access complaints on sparc

Florian Fainelli <f.fainelli@gmail.com>
    net: systemport: Decouple flow control from __bcm_sysport_tx_reclaim

David Ahern <dsa@cumulusnetworks.com>
    net: ipv4: fix table id in getroute response

David Ahern <dsa@cumulusnetworks.com>
    net: lwtunnel: Handle lwtunnel_fill_encap failure

Elad Raz <eladr@mellanox.com>
    mlxsw: pci: Fix EQE structure definition

Arkadi Sharshevsky <arkadis@mellanox.com>
    mlxsw: switchx2: Fix memory leak at skb reallocation

Arkadi Sharshevsky <arkadis@mellanox.com>
    mlxsw: spectrum: Fix memory leak at skb reallocation

hayeswang <hayeswang@realtek.com>
    r8152: fix the sw rx checksum is unavailable


-------------

Diffstat:

 Makefile                                       |  4 ++--
 drivers/net/ethernet/broadcom/bcmsysport.c     | 25 +++++++++++++------
 drivers/net/ethernet/mellanox/mlxsw/pci.h      |  8 +++----
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c |  1 +
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c |  1 +
 drivers/net/ethernet/renesas/ravb_main.c       | 13 ++++++++++
 drivers/net/phy/bcm63xx.c                      | 21 ++++++++++++++--
 drivers/net/usb/cdc_ether.c                    |  8 +++++++
 drivers/net/usb/qmi_wwan.c                     |  7 ++++++
 drivers/net/usb/r8152.c                        |  9 ++++++-
 include/linux/tcp.h                            |  7 +++++-
 net/ax25/ax25_subr.c                           |  2 +-
 net/bridge/br_netlink.c                        | 33 +++++++++++++++-----------
 net/core/dev.c                                 |  4 ++--
 net/dsa/slave.c                                |  2 ++
 net/ipv4/fib_semantics.c                       | 11 +++++----
 net/ipv4/route.c                               |  2 +-
 net/ipv4/tcp_fastopen.c                        |  3 ++-
 net/ipv6/addrconf.c                            |  4 +---
 net/ipv6/route.c                               |  3 ++-
 net/openvswitch/conntrack.c                    |  3 ++-
 net/unix/af_unix.c                             | 27 ++++++++++++---------
 22 files changed, 142 insertions(+), 56 deletions(-)

[toc] | [next] | [standalone]


#1572614 — [PATCH 4.4 15/20] tcp: initialize max window for a new fastopen socket

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 15/20] tcp: initialize max window for a new fastopen socket
Message-ID<t6usA-7Bs-77@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Alexey Kodanev <alexey.kodanev@oracle.com>


[ Upstream commit 0dbd7ff3ac5017a46033a9d0a87a8267d69119d9 ]

Found that if we run LTP netstress test with large MSS (65K),
the first attempt from server to send data comparable to this
MSS on fastopen connection will be delayed by the probe timer.

Here is an example:

     < S  seq 0:0 win 43690 options [mss 65495 wscale 7 tfo cookie] length 32
     > S. seq 0:0 ack 1 win 43690 options [mss 65495 wscale 7] length 0
     < .  ack 1 win 342 length 0

Inside tcp_sendmsg(), tcp_send_mss() returns max MSS in 'mss_now',
as well as in 'size_goal'. This results the segment not queued for
transmition until all the data copied from user buffer. Then, inside
__tcp_push_pending_frames(), it breaks on send window test and
continues with the check probe timer.

Fragmentation occurs in tcp_write_wakeup()...

+0.2 > P. seq 1:43777 ack 1 win 342 length 43776
     < .  ack 43777, win 1365 length 0
     > P. seq 43777:65001 ack 1 win 342 options [...] length 21224
     ...

This also contradicts with the fact that we should bound to the half
of the window if it is large.

Fix this flaw by correctly initializing max_window. Before that, it
could have large values that affect further calculations of 'size_goal'.

Fixes: 168a8f58059a ("tcp: TCP Fast Open Server - main code path")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/tcp_fastopen.c |    1 +
 1 file changed, 1 insertion(+)

--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
@@ -161,6 +161,7 @@ static struct sock *tcp_fastopen_create_
 	 * scaled. So correct it appropriately.
 	 */
 	tp->snd_wnd = ntohs(tcp_hdr(skb)->window);
+	tp->max_window = tp->snd_wnd;
 
 	/* Activate the retrans timer so that SYNACK can be retransmitted.
 	 * The request socket is not added to the ehash

[toc] | [prev] | [next] | [standalone]


#1572616 — [PATCH 4.4 12/20] net: fix harmonize_features() vs NETIF_F_HIGHDMA

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 12/20] net: fix harmonize_features() vs NETIF_F_HIGHDMA
Message-ID<t6usA-7Bs-75@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Dumazet <edumazet@google.com>


[ Upstream commit 7be2c82cfd5d28d7adb66821a992604eb6dd112e ]

Ashizuka reported a highmem oddity and sent a patch for freescale
fec driver.

But the problem root cause is that core networking stack
must ensure no skb with highmem fragment is ever sent through
a device that does not assert NETIF_F_HIGHDMA in its features.

We need to call illegal_highdma() from harmonize_features()
regardless of CSUM checks.

Fixes: ec5f06156423 ("net: Kill link between CSUM and SG features.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Pravin Shelar <pshelar@ovn.org>
Reported-by: "Ashizuka, Yuusuke" <ashiduka@jp.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/core/dev.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2650,9 +2650,9 @@ static netdev_features_t harmonize_featu
 	if (skb->ip_summed != CHECKSUM_NONE &&
 	    !can_checksum_protocol(features, type)) {
 		features &= ~NETIF_F_ALL_CSUM;
-	} else if (illegal_highdma(skb->dev, skb)) {
-		features &= ~NETIF_F_SG;
 	}
+	if (illegal_highdma(skb->dev, skb))
+		features &= ~NETIF_F_SG;
 
 	return features;
 }

[toc] | [prev] | [next] | [standalone]


#1572618 — [PATCH 4.4 02/20] mlxsw: spectrum: Fix memory leak at skb reallocation

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 02/20] mlxsw: spectrum: Fix memory leak at skb reallocation
Message-ID<t6usB-7Bs-89@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Arkadi Sharshevsky <arkadis@mellanox.com>


[ Upstream commit 36bf38d158d3482119b3e159c0619b3c1539b508 ]

During transmission the skb is checked for headroom in order to
add vendor specific header. In case the skb needs to be re-allocated,
skb_realloc_headroom() is called to make a private copy of the original,
but doesn't release it. Current code assumes that the original skb is
released during reallocation and only releases it at the error path
which causes a memory leak.

Fix this by adding the original skb release to the main path.

Fixes: 56ade8fe3fe1 ("mlxsw: spectrum: Add initial support for Spectrum ASIC")
Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c |    1 +
 1 file changed, 1 insertion(+)

--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -390,6 +390,7 @@ static netdev_tx_t mlxsw_sp_port_xmit(st
 			dev_kfree_skb_any(skb_orig);
 			return NETDEV_TX_OK;
 		}
+		dev_consume_skb_any(skb_orig);
 	}
 
 	if (eth_skb_pad(skb)) {

[toc] | [prev] | [next] | [standalone]


#1572619 — [PATCH 4.4 20/20] net: dsa: Bring back device detaching in dsa_slave_suspend()

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 20/20] net: dsa: Bring back device detaching in dsa_slave_suspend()
Message-ID<t6usB-7Bs-91@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Florian Fainelli <f.fainelli@gmail.com>


[ Upstream commit f154be241d22298d2b63c9b613f619fa1086ea75 ]

Commit 448b4482c671 ("net: dsa: Add lockdep class to tx queues to avoid
lockdep splat") removed the netif_device_detach() call done in
dsa_slave_suspend() which is necessary, and paired with a corresponding
netif_device_attach(), bring it back.

Fixes: 448b4482c671 ("net: dsa: Add lockdep class to tx queues to avoid lockdep splat")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/dsa/slave.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1101,6 +1101,8 @@ int dsa_slave_suspend(struct net_device
 {
 	struct dsa_slave_priv *p = netdev_priv(slave_dev);
 
+	netif_device_detach(slave_dev);
+
 	if (p->phy) {
 		phy_stop(p->phy);
 		p->old_pause = -1;

[toc] | [prev] | [next] | [standalone]


#1572621 — [PATCH 4.4 05/20] net: lwtunnel: Handle lwtunnel_fill_encap failure

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 05/20] net: lwtunnel: Handle lwtunnel_fill_encap failure
Message-ID<t6usB-7Bs-99@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: David Ahern <dsa@cumulusnetworks.com>


[ Upstream commit ea7a80858f57d8878b1499ea0f1b8a635cc48de7 ]

Handle failure in lwtunnel_fill_encap adding attributes to skb.

Fixes: 571e722676fe ("ipv4: support for fib route lwtunnel encap attributes")
Fixes: 19e42e451506 ("ipv6: support for fib route lwtunnel encap attributes")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/fib_semantics.c |   11 +++++++----
 net/ipv6/route.c         |    3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1277,8 +1277,9 @@ int fib_dump_info(struct sk_buff *skb, u
 		    nla_put_u32(skb, RTA_FLOW, fi->fib_nh[0].nh_tclassid))
 			goto nla_put_failure;
 #endif
-		if (fi->fib_nh->nh_lwtstate)
-			lwtunnel_fill_encap(skb, fi->fib_nh->nh_lwtstate);
+		if (fi->fib_nh->nh_lwtstate &&
+		    lwtunnel_fill_encap(skb, fi->fib_nh->nh_lwtstate) < 0)
+			goto nla_put_failure;
 	}
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
 	if (fi->fib_nhs > 1) {
@@ -1314,8 +1315,10 @@ int fib_dump_info(struct sk_buff *skb, u
 			    nla_put_u32(skb, RTA_FLOW, nh->nh_tclassid))
 				goto nla_put_failure;
 #endif
-			if (nh->nh_lwtstate)
-				lwtunnel_fill_encap(skb, nh->nh_lwtstate);
+			if (nh->nh_lwtstate &&
+			    lwtunnel_fill_encap(skb, nh->nh_lwtstate) < 0)
+				goto nla_put_failure;
+
 			/* length of rtnetlink header + attributes */
 			rtnh->rtnh_len = nlmsg_get_pos(skb) - (void *) rtnh;
 		} endfor_nexthops(fi);
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3196,7 +3196,8 @@ static int rt6_fill_node(struct net *net
 	if (nla_put_u8(skb, RTA_PREF, IPV6_EXTRACT_PREF(rt->rt6i_flags)))
 		goto nla_put_failure;
 
-	lwtunnel_fill_encap(skb, rt->dst.lwtstate);
+	if (lwtunnel_fill_encap(skb, rt->dst.lwtstate) < 0)
+		goto nla_put_failure;
 
 	nlmsg_end(skb, nlh);
 	return 0;

[toc] | [prev] | [next] | [standalone]


#1572624 — [PATCH 4.4 14/20] ipv6: addrconf: Avoid addrconf_disable_change() using RCU read-side lock

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 14/20] ipv6: addrconf: Avoid addrconf_disable_change() using RCU read-side lock
Message-ID<t6usB-7Bs-109@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Kefeng Wang <wangkefeng.wang@huawei.com>


[ Upstream commit 03e4deff4987f79c34112c5ba4eb195d4f9382b0 ]

Just like commit 4acd4945cd1e ("ipv6: addrconf: Avoid calling
netdevice notifiers with RCU read-side lock"), it is unnecessary
to make addrconf_disable_change() use RCU iteration over the
netdev list, since it already holds the RTNL lock, or we may meet
Illegal context switch in RCU read-side critical section.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv6/addrconf.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5244,8 +5244,7 @@ static void addrconf_disable_change(stru
 	struct net_device *dev;
 	struct inet6_dev *idev;
 
-	rcu_read_lock();
-	for_each_netdev_rcu(net, dev) {
+	for_each_netdev(net, dev) {
 		idev = __in6_dev_get(dev);
 		if (idev) {
 			int changed = (!idev->cnf.disable_ipv6) ^ (!newf);
@@ -5254,7 +5253,6 @@ static void addrconf_disable_change(stru
 				dev_disable_change(idev);
 		}
 	}
-	rcu_read_unlock();
 }
 
 static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)

[toc] | [prev] | [next] | [standalone]


#1572625 — [PATCH 4.4 13/20] net: phy: bcm63xx: Utilize correct config_intr function

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 13/20] net: phy: bcm63xx: Utilize correct config_intr function
Message-ID<t6usC-7Bs-113@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>


[ Upstream commit cd33b3e0da43522ff8e8f2b2b71d3d08298512b0 ]

Commit a1cba5613edf ("net: phy: Add Broadcom phy library for common
interfaces") make the BCM63xx PHY driver utilize bcm_phy_config_intr()
which would appear to do the right thing, except that it does not write
to the MII_BCM63XX_IR register but to MII_BCM54XX_ECR which is
different.

This would be causing invalid link parameters and events from being
generated by the PHY interrupt.

Fixes: a1cba5613edf ("net: phy: Add Broadcom phy library for common interfaces")
Signed-off-by: Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/phy/bcm63xx.c |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

--- a/drivers/net/phy/bcm63xx.c
+++ b/drivers/net/phy/bcm63xx.c
@@ -21,6 +21,23 @@ MODULE_DESCRIPTION("Broadcom 63xx intern
 MODULE_AUTHOR("Maxime Bizon <mbizon@freebox.fr>");
 MODULE_LICENSE("GPL");
 
+static int bcm63xx_config_intr(struct phy_device *phydev)
+{
+	int reg, err;
+
+	reg = phy_read(phydev, MII_BCM63XX_IR);
+	if (reg < 0)
+		return reg;
+
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+		reg &= ~MII_BCM63XX_IR_GMASK;
+	else
+		reg |= MII_BCM63XX_IR_GMASK;
+
+	err = phy_write(phydev, MII_BCM63XX_IR, reg);
+	return err;
+}
+
 static int bcm63xx_config_init(struct phy_device *phydev)
 {
 	int reg, err;
@@ -55,7 +72,7 @@ static struct phy_driver bcm63xx_driver[
 	.config_aneg	= genphy_config_aneg,
 	.read_status	= genphy_read_status,
 	.ack_interrupt	= bcm_phy_ack_intr,
-	.config_intr	= bcm_phy_config_intr,
+	.config_intr	= bcm63xx_config_intr,
 	.driver		= { .owner = THIS_MODULE },
 }, {
 	/* same phy as above, with just a different OUI */
@@ -68,7 +85,7 @@ static struct phy_driver bcm63xx_driver[
 	.config_aneg	= genphy_config_aneg,
 	.read_status	= genphy_read_status,
 	.ack_interrupt	= bcm_phy_ack_intr,
-	.config_intr	= bcm_phy_config_intr,
+	.config_intr	= bcm63xx_config_intr,
 	.driver		= { .owner = THIS_MODULE },
 } };
 

[toc] | [prev] | [next] | [standalone]


#1572628 — [PATCH 4.4 06/20] net: ipv4: fix table id in getroute response

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-02-02 19:40 +0100
Subject[PATCH 4.4 06/20] net: ipv4: fix table id in getroute response
Message-ID<t6usC-7Bs-111@gated-at.bofh.it>
In reply to#1572613
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: David Ahern <dsa@cumulusnetworks.com>


[ Upstream commit 8a430ed50bb1b19ca14a46661f3b1b35f2fb5c39 ]

rtm_table is an 8-bit field while table ids are allowed up to u32. Commit
709772e6e065 ("net: Fix routing tables with id > 255 for legacy software")
added the preference to set rtm_table in dumps to RT_TABLE_COMPAT if the
table id is > 255. The table id returned on get route requests should do
the same.

Fixes: c36ba6603a11 ("net: Allow user to get table id from route lookup")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/route.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2430,7 +2430,7 @@ static int rt_fill_info(struct net *net,
 	r->rtm_dst_len	= 32;
 	r->rtm_src_len	= 0;
 	r->rtm_tos	= fl4->flowi4_tos;
-	r->rtm_table	= table_id;
+	r->rtm_table	= table_id < 256 ? table_id : RT_TABLE_COMPAT;
 	if (nla_put_u32(skb, RTA_TABLE, table_id))
 		goto nla_put_failure;
 	r->rtm_type	= rt->rt_type;

[toc] | [prev] | [next] | [standalone]


#1572737

FromShuah Khan <shuahkh@osg.samsung.com>
Date2017-02-02 21:40 +0100
Message-ID<t6wkF-lW-1@gated-at.bofh.it>
In reply to#1572613
On 02/02/2017 11:33 AM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.4.47 release.
> There are 20 patches in this series, all will be posted as a response
> to this one.  If anyone has any issues with these being applied, please
> let me know.
> 
> Responses should be made by Sat Feb  4 18:32:49 UTC 2017.
> Anything received after that time might be too late.
> 
> The whole patch series can be found in one patch at:
> 	kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.47-rc1.gz
> or in the git tree and branch at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
> and the diffstat can be found below.
> 
> thanks,
> 
> greg k-h
> 

Compiled and booted on my test system. No dmesg regressions.

thanks,
-- Shuah

[toc] | [prev] | [next] | [standalone]


#1572889

FromGuenter Roeck <linux@roeck-us.net>
Date2017-02-03 06:20 +0100
Message-ID<t6ErT-5C9-7@gated-at.bofh.it>
In reply to#1572613
On 02/02/2017 10:33 AM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.4.47 release.
> There are 20 patches in this series, all will be posted as a response
> to this one.  If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sat Feb  4 18:32:49 UTC 2017.
> Anything received after that time might be too late.
>

Build results:
	total: 149 pass: 149 fail: 0
Qemu test results:
	total: 115 pass: 115 fail: 0

Details are available at http://kerneltests.org/builders.

Guenter

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web