kernel: bump 4.19 to 4.19.115
Refreshed all patches. Remove upstreamed: - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch Fixes: - CVE-2020-8647 - CVE-2020-8648 (potentially) - CVE-2020-8649 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>master
Koen Vandeputte
4 years ago
parent
e31d158c4d
commit
3c3825436e
@ -1,71 +0,0 @@
|
|||||||
From 82afdcd4ec3c8ca6551cbf7c43c09e2fd240487a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hangbin Liu <liuhangbin@gmail.com>
|
|
||||||
Date: Tue, 10 Mar 2020 15:27:37 +0800
|
|
||||||
Subject: [PATCH] ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Rafał found an issue that for non-Ethernet interface, if we down and up
|
|
||||||
frequently, the memory will be consumed slowly.
|
|
||||||
|
|
||||||
The reason is we add allnodes/allrouters addressed in multicast list in
|
|
||||||
ipv6_add_dev(). When link down, we call ipv6_mc_down(), store all multicast
|
|
||||||
addresses via mld_add_delrec(). But when link up, we don't call ipv6_mc_up()
|
|
||||||
for non-Ethernet interface to remove the addresses. This makes idev->mc_tomb
|
|
||||||
getting bigger and bigger. The call stack looks like:
|
|
||||||
|
|
||||||
addrconf_notify(NETDEV_REGISTER)
|
|
||||||
ipv6_add_dev
|
|
||||||
ipv6_dev_mc_inc(ff01::1)
|
|
||||||
ipv6_dev_mc_inc(ff02::1)
|
|
||||||
ipv6_dev_mc_inc(ff02::2)
|
|
||||||
|
|
||||||
addrconf_notify(NETDEV_UP)
|
|
||||||
addrconf_dev_config
|
|
||||||
/* Alas, we support only Ethernet autoconfiguration. */
|
|
||||||
return;
|
|
||||||
|
|
||||||
addrconf_notify(NETDEV_DOWN)
|
|
||||||
addrconf_ifdown
|
|
||||||
ipv6_mc_down
|
|
||||||
igmp6_group_dropped(ff02::2)
|
|
||||||
mld_add_delrec(ff02::2)
|
|
||||||
igmp6_group_dropped(ff02::1)
|
|
||||||
igmp6_group_dropped(ff01::1)
|
|
||||||
|
|
||||||
After investigating, I can't found a rule to disable multicast on
|
|
||||||
non-Ethernet interface. In RFC2460, the link could be Ethernet, PPP, ATM,
|
|
||||||
tunnels, etc. In IPv4, it doesn't check the dev type when calls ip_mc_up()
|
|
||||||
in inetdev_event(). Even for IPv6, we don't check the dev type and call
|
|
||||||
ipv6_add_dev(), ipv6_dev_mc_inc() after register device.
|
|
||||||
|
|
||||||
So I think it's OK to fix this memory consumer by calling ipv6_mc_up() for
|
|
||||||
non-Ethernet interface.
|
|
||||||
|
|
||||||
v2: Also check IFF_MULTICAST flag to make sure the interface supports
|
|
||||||
multicast
|
|
||||||
|
|
||||||
Reported-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Tested-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Fixes: 74235a25c673 ("[IPV6] addrconf: Fix IPv6 on tuntap tunnels")
|
|
||||||
Fixes: 1666d49e1d41 ("mld: do not remove mld souce list info when set link down")
|
|
||||||
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
net/ipv6/addrconf.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
--- a/net/ipv6/addrconf.c
|
|
||||||
+++ b/net/ipv6/addrconf.c
|
|
||||||
@@ -3291,6 +3291,10 @@ static void addrconf_dev_config(struct n
|
|
||||||
(dev->type != ARPHRD_NONE) &&
|
|
||||||
(dev->type != ARPHRD_RAWIP)) {
|
|
||||||
/* Alas, we support only Ethernet autoconfiguration. */
|
|
||||||
+ idev = __in6_dev_get(dev);
|
|
||||||
+ if (!IS_ERR_OR_NULL(idev) && dev->flags & IFF_UP &&
|
|
||||||
+ dev->flags & IFF_MULTICAST)
|
|
||||||
+ ipv6_mc_up(idev);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From 9d2e23253eb5fabff02a7ce4be9c4a7fc23562e8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pawel Dembicki <paweldembicki@gmail.com>
|
|
||||||
Date: Fri, 20 Mar 2020 22:56:28 +0100
|
|
||||||
Subject: [PATCH v2 3/3] USB: serial: option: add Wistron Neweb D19Q1
|
|
||||||
|
|
||||||
This modem is embedded on dlink dwr-960 router.
|
|
||||||
The oem configuration states:
|
|
||||||
|
|
||||||
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0
|
|
||||||
D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
|
|
||||||
P: Vendor=1435 ProdID=d191 Rev=ff.ff
|
|
||||||
S: Manufacturer=Android
|
|
||||||
S: Product=Android
|
|
||||||
S: SerialNumber=0123456789ABCDEF
|
|
||||||
C:* #Ifs= 6 Cfg#= 1 Atr=80 MxPwr=500mA
|
|
||||||
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
|
|
||||||
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
|
|
||||||
E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
|
|
||||||
E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
|
|
||||||
E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
|
|
||||||
E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
|
|
||||||
E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
|
|
||||||
E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms
|
|
||||||
E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
I:* If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=(none)
|
|
||||||
E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
|
||||||
E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=125us
|
|
||||||
|
|
||||||
Tested on openwrt distribution
|
|
||||||
|
|
||||||
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/usb/serial/option.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/usb/serial/option.c
|
|
||||||
+++ b/drivers/usb/serial/option.c
|
|
||||||
@@ -1990,6 +1990,8 @@ static const struct usb_device_id option
|
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
|
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
|
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */
|
|
||||||
+ { USB_DEVICE_INTERFACE_CLASS(0x1435, 0xd191, 0xff), /* Wistron Neweb D19Q1 */
|
|
||||||
+ .driver_info = RSVD(1) | RSVD(4) },
|
|
||||||
{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2031, 0xff), /* Olicard 600 */
|
|
||||||
.driver_info = RSVD(4) },
|
|
||||||
{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2060, 0xff), /* BroadMobi BM818 */
|
|
||||||
Loading…
Reference in New Issue