mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-19 11:16:32 +00:00
kernel: bump 5.10 to 5.10.159
Removed upstreamed:
backport-5.10/888-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch[1]
All patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.159&id=0a8e66e375736ea12c11f0ef238ba2a8efec460b
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 90120a1552
)
This commit is contained in:
parent
e5cec69484
commit
d909fb1d3b
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.10 = .158
|
||||
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
|
||||
LINUX_VERSION-5.10 = .159
|
||||
LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7
|
||||
|
@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
--- a/drivers/media/common/videobuf2/videobuf2-core.c
|
||||
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
|
||||
@@ -2140,12 +2140,12 @@ static int __find_plane_by_offset(struct
|
||||
@@ -2191,12 +2191,12 @@ static int __find_plane_by_offset(struct
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
struct dma_buf *dbuf;
|
||||
|
||||
if (q->memory != VB2_MEMORY_MMAP) {
|
||||
@@ -2195,6 +2195,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
|
||||
@@ -2246,6 +2246,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
#define USB_VENDOR_ID_BELKIN 0x050d
|
||||
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
||||
|
||||
@@ -1274,6 +1277,9 @@
|
||||
@@ -1276,6 +1279,9 @@
|
||||
#define USB_VENDOR_ID_XAT 0x2505
|
||||
#define USB_DEVICE_ID_XAT_CSR 0x0220
|
||||
|
||||
@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
|
||||
@@ -195,6 +196,7 @@ static const struct hid_device_id hid_qu
|
||||
@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
|
||||
|
@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
mdio = of_find_node_by_phandle(*ph);
|
||||
--- a/drivers/net/ethernet/aeroflex/greth.c
|
||||
+++ b/drivers/net/ethernet/aeroflex/greth.c
|
||||
@@ -1449,10 +1449,10 @@ static int greth_of_probe(struct platfor
|
||||
@@ -1450,10 +1450,10 @@ static int greth_of_probe(struct platfor
|
||||
break;
|
||||
}
|
||||
if (i == 6) {
|
||||
|
@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
memmove(skb->data - ETH_HLEN,
|
||||
--- a/net/dsa/tag_ksz.c
|
||||
+++ b/net/dsa/tag_ksz.c
|
||||
@@ -24,7 +24,7 @@ static struct sk_buff *ksz_common_rcv(st
|
||||
|
||||
pskb_trim_rcsum(skb, skb->len - len);
|
||||
@@ -25,7 +25,7 @@ static struct sk_buff *ksz_common_rcv(st
|
||||
if (pskb_trim_rcsum(skb, skb->len - len))
|
||||
return NULL;
|
||||
|
||||
- skb->offload_fwd_mark = true;
|
||||
+ dsa_default_offload_fwd_mark(skb);
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 1e24c54da257ab93cff5826be8a793b014a5dc9c Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 21 Nov 2022 01:22:01 +0100
|
||||
Subject: ca8210: Fix crash by zero initializing data
|
||||
|
||||
The struct cas_control embeds multiple generic SPI structures and we
|
||||
have to make sure these structures are initialized to default values.
|
||||
This driver does not set all attributes. When using kmalloc before some
|
||||
attributes were not initialized and contained random data which caused
|
||||
random crashes at bootup.
|
||||
|
||||
Fixes: ded845a781a5 ("ieee802154: Add CA8210 IEEE 802.15.4 device driver")
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Link: https://lore.kernel.org/r/20221121002201.1339636-1-hauke@hauke-m.de
|
||||
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
|
||||
---
|
||||
drivers/net/ieee802154/ca8210.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/ieee802154/ca8210.c
|
||||
+++ b/drivers/net/ieee802154/ca8210.c
|
||||
@@ -926,7 +926,7 @@ static int ca8210_spi_transfer(
|
||||
|
||||
dev_dbg(&spi->dev, "%s called\n", __func__);
|
||||
|
||||
- cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);
|
||||
+ cas_ctl = kzalloc(sizeof(*cas_ctl), GFP_ATOMIC);
|
||||
if (!cas_ctl)
|
||||
return -ENOMEM;
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -680,7 +680,7 @@
|
||||
@@ -679,7 +679,7 @@
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
status = "okay";
|
||||
|
Loading…
Reference in New Issue
Block a user