Commit f6cfd5f9 authored by Ben Hutchings's avatar Ben Hutchings

Merge branch 'hrw-guest/linux-sid' into sid

Update to 4.19.20

See merge request kernel-team/linux!116
parents 406f867a bb2161ae
This diff is collapsed.
......@@ -14,9 +14,11 @@ correctness.
[bwh: Also #if-out the init functions for these PHYs to avoid
compiler warnings]
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -928,6 +928,7 @@ static int m88e1118_config_init(struct p
Index: linux/drivers/net/phy/marvell.c
===================================================================
--- linux.orig/drivers/net/phy/marvell.c
+++ linux/drivers/net/phy/marvell.c
@@ -962,6 +962,7 @@ static int m88e1118_config_init(struct p
return genphy_soft_reset(phydev);
}
......@@ -24,7 +26,7 @@ correctness.
static int m88e1149_config_init(struct phy_device *phydev)
{
int err;
@@ -953,7 +954,9 @@ static int m88e1149_config_init(struct p
@@ -987,7 +988,9 @@ static int m88e1149_config_init(struct p
return genphy_soft_reset(phydev);
}
......@@ -34,15 +36,15 @@ correctness.
static int m88e1145_config_init_rgmii(struct phy_device *phydev)
{
int err;
@@ -1028,6 +1031,7 @@ static int m88e1145_config_init(struct p
@@ -1062,6 +1065,7 @@ static int m88e1145_config_init(struct p
return 0;
}
+#endif
/**
* fiber_lpa_to_ethtool_lpa_t
@@ -2102,6 +2106,7 @@ static struct phy_driver marvell_drivers
/* The VOD can be out of specification on link up. Poke an
* undocumented register, in an undocumented page, with a magic value
@@ -2175,6 +2179,7 @@ static struct phy_driver marvell_drivers
.get_strings = marvell_get_strings,
.get_stats = marvell_get_stats,
},
......@@ -50,7 +52,7 @@ correctness.
{
.phy_id = MARVELL_PHY_ID_88E1145,
.phy_id_mask = MARVELL_PHY_ID_MASK,
@@ -2122,6 +2127,8 @@ static struct phy_driver marvell_drivers
@@ -2195,6 +2200,8 @@ static struct phy_driver marvell_drivers
.get_strings = marvell_get_strings,
.get_stats = marvell_get_stats,
},
......@@ -59,7 +61,7 @@ correctness.
{
.phy_id = MARVELL_PHY_ID_88E1149R,
.phy_id_mask = MARVELL_PHY_ID_MASK,
@@ -2141,6 +2148,8 @@ static struct phy_driver marvell_drivers
@@ -2214,6 +2221,8 @@ static struct phy_driver marvell_drivers
.get_strings = marvell_get_strings,
.get_stats = marvell_get_stats,
},
......@@ -68,7 +70,7 @@ correctness.
{
.phy_id = MARVELL_PHY_ID_88E1240,
.phy_id_mask = MARVELL_PHY_ID_MASK,
@@ -2160,6 +2169,7 @@ static struct phy_driver marvell_drivers
@@ -2233,6 +2242,7 @@ static struct phy_driver marvell_drivers
.get_strings = marvell_get_strings,
.get_stats = marvell_get_stats,
},
......@@ -76,7 +78,7 @@ correctness.
{
.phy_id = MARVELL_PHY_ID_88E1116R,
.phy_id_mask = MARVELL_PHY_ID_MASK,
@@ -2296,9 +2306,9 @@ static struct mdio_device_id __maybe_unu
@@ -2369,9 +2379,9 @@ static struct mdio_device_id __maybe_unu
{ MARVELL_PHY_ID_88E1111, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK },
......
From: David Ahern <dsahern@gmail.com>
Date: Wed, 2 Jan 2019 18:57:09 -0800
Subject: ipv6: Consider sk_bound_dev_if when binding a socket to an address
Origin: https://git.kernel.org/linus/c5ee066333ebc322a24a00a743ed941a0c68617e
Bug-Debian: https://bugs.debian.org/918103
IPv6 does not consider if the socket is bound to a device when binding
to an address. The result is that a socket can be bound to eth0 and then
bound to the address of eth1. If the device is a VRF, the result is that
a socket can only be bound to an address in the default VRF.
Resolve by considering the device if sk_bound_dev_if is set.
This problem exists from the beginning of git history.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv6/af_inet6.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index f0cd291034f0..0bfb6cc0a30a 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -350,6 +350,9 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
err = -EINVAL;
goto out_unlock;
}
+ }
+
+ if (sk->sk_bound_dev_if) {
dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
if (!dev) {
err = -ENODEV;
--
2.20.1
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 11 Jan 2019 14:33:16 +0100
Subject: posix-cpu-timers: Unbreak timer rearming
Origin: https://lore.kernel.org/lkml/20190111133500.840117406@linutronix.de/
Bug-Debian: https://bugs.debian.org/919019
Bug-Debian: https://bugs.debian.org/919049
The recent commit which prevented a division by 0 issue in the alarm timer
code broke posix CPU timers as an unwanted side effect.
The reason is that the common rearm code checks for timer->it_interval
being 0 now. What went unnoticed is that the posix cpu timer setup does not
initialize timer->it_interval as it stores the interval in CPU timer
specific storage. The reason for the separate storage is historical as the
posix CPU timers always had a 64bit nanoseconds representation internally
while timer->it_interval is type ktime_t which used to be a modified
timespec representation on 32bit machines.
Instead of reverting the offending commit and fixing the alarmtimer issue
in the alarmtimer code, store the interval in timer->it_interval at CPU
timer setup time so the common code check works. This also repairs the
existing inconistency of the posix CPU timer code which kept a single shot
timer armed despite of the interval being 0.
The separate storage can be removed in mainline, but that needs to be a
separate commit as the current one has to be backported to stable kernels.
Fixes: 0e334db6bb4b ("posix-timers: Fix division by zero bug")
Reported-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
---
kernel/time/posix-cpu-timers.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 8f0644af40be..80f955210861 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -685,6 +685,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
* set up the signal and overrun bookkeeping.
*/
timer->it.cpu.incr = timespec64_to_ns(&new->it_interval);
+ timer->it_interval = ns_to_ktime(timer->it.cpu.incr);
/*
* This acts as a modification timestamp for the timer,
--
2.20.1
......@@ -99,8 +99,6 @@ bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
debian/revert-objtool-fix-config_stack_validation-y-warning.patch
bugfix/all/ipv6-Consider-sk_bound_dev_if-when-binding-a-socket-.patch
bugfix/all/posix-cpu-timers-Unbreak-timer-rearming.patch
bugfix/all/percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch
# Miscellaneous features
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment