From: Sasha Levin Date: Mon, 12 Dec 2022 05:44:17 +0000 (-0500) Subject: Fixes for 5.10 X-Git-Tag: v4.9.336~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da87ff001b8cba4bb577eb883c77781f385c68f3;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/af_unix-get-user_ns-from-in_skb-in-unix_diag_get_exa.patch b/queue-5.10/af_unix-get-user_ns-from-in_skb-in-unix_diag_get_exa.patch new file mode 100644 index 00000000000..2d29d4de760 --- /dev/null +++ b/queue-5.10/af_unix-get-user_ns-from-in_skb-in-unix_diag_get_exa.patch @@ -0,0 +1,166 @@ +From eda39afe046f95ce70642f08189a284244ce9991 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 27 Nov 2022 10:24:11 +0900 +Subject: af_unix: Get user_ns from in_skb in unix_diag_get_exact(). + +From: Kuniyuki Iwashima + +[ Upstream commit b3abe42e94900bdd045c472f9c9be620ba5ce553 ] + +Wei Chen reported a NULL deref in sk_user_ns() [0][1], and Paolo diagnosed +the root cause: in unix_diag_get_exact(), the newly allocated skb does not +have sk. [2] + +We must get the user_ns from the NETLINK_CB(in_skb).sk and pass it to +sk_diag_fill(). + +[0]: +BUG: kernel NULL pointer dereference, address: 0000000000000270 +#PF: supervisor read access in kernel mode +#PF: error_code(0x0000) - not-present page +PGD 12bbce067 P4D 12bbce067 PUD 12bc40067 PMD 0 +Oops: 0000 [#1] PREEMPT SMP +CPU: 0 PID: 27942 Comm: syz-executor.0 Not tainted 6.1.0-rc5-next-20221118 #2 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS +rel-1.13.0-48-gd9c812dda519-prebuilt.qemu.org 04/01/2014 +RIP: 0010:sk_user_ns include/net/sock.h:920 [inline] +RIP: 0010:sk_diag_dump_uid net/unix/diag.c:119 [inline] +RIP: 0010:sk_diag_fill+0x77d/0x890 net/unix/diag.c:170 +Code: 89 ef e8 66 d4 2d fd c7 44 24 40 00 00 00 00 49 8d 7c 24 18 e8 +54 d7 2d fd 49 8b 5c 24 18 48 8d bb 70 02 00 00 e8 43 d7 2d fd <48> 8b +9b 70 02 00 00 48 8d 7b 10 e8 33 d7 2d fd 48 8b 5b 10 48 8d +RSP: 0018:ffffc90000d67968 EFLAGS: 00010246 +RAX: ffff88812badaa48 RBX: 0000000000000000 RCX: ffffffff840d481d +RDX: 0000000000000465 RSI: 0000000000000000 RDI: 0000000000000270 +RBP: ffffc90000d679a8 R08: 0000000000000277 R09: 0000000000000000 +R10: 0001ffffffffffff R11: 0001c90000d679a8 R12: ffff88812ac03800 +R13: ffff88812c87c400 R14: ffff88812ae42210 R15: ffff888103026940 +FS: 00007f08b4e6f700(0000) GS:ffff88813bc00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 0000000000000270 CR3: 000000012c58b000 CR4: 00000000003506f0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +Call Trace: + + unix_diag_get_exact net/unix/diag.c:285 [inline] + unix_diag_handler_dump+0x3f9/0x500 net/unix/diag.c:317 + __sock_diag_cmd net/core/sock_diag.c:235 [inline] + sock_diag_rcv_msg+0x237/0x250 net/core/sock_diag.c:266 + netlink_rcv_skb+0x13e/0x250 net/netlink/af_netlink.c:2564 + sock_diag_rcv+0x24/0x40 net/core/sock_diag.c:277 + netlink_unicast_kernel net/netlink/af_netlink.c:1330 [inline] + netlink_unicast+0x5e9/0x6b0 net/netlink/af_netlink.c:1356 + netlink_sendmsg+0x739/0x860 net/netlink/af_netlink.c:1932 + sock_sendmsg_nosec net/socket.c:714 [inline] + sock_sendmsg net/socket.c:734 [inline] + ____sys_sendmsg+0x38f/0x500 net/socket.c:2476 + ___sys_sendmsg net/socket.c:2530 [inline] + __sys_sendmsg+0x197/0x230 net/socket.c:2559 + __do_sys_sendmsg net/socket.c:2568 [inline] + __se_sys_sendmsg net/socket.c:2566 [inline] + __x64_sys_sendmsg+0x42/0x50 net/socket.c:2566 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0xcd +RIP: 0033:0x4697f9 +Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 +89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d +01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 +RSP: 002b:00007f08b4e6ec48 EFLAGS: 00000246 ORIG_RAX: 000000000000002e +RAX: ffffffffffffffda RBX: 000000000077bf80 RCX: 00000000004697f9 +RDX: 0000000000000000 RSI: 00000000200001c0 RDI: 0000000000000003 +RBP: 00000000004d29e9 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: 0000000000000246 R12: 000000000077bf80 +R13: 0000000000000000 R14: 000000000077bf80 R15: 00007ffdb36bc6c0 + +Modules linked in: +CR2: 0000000000000270 + +[1]: https://lore.kernel.org/netdev/CAO4mrfdvyjFpokhNsiwZiP-wpdSD0AStcJwfKcKQdAALQ9_2Qw@mail.gmail.com/ +[2]: https://lore.kernel.org/netdev/e04315e7c90d9a75613f3993c2baf2d344eef7eb.camel@redhat.com/ + +Fixes: cae9910e7344 ("net: Add UNIX_DIAG_UID to Netlink UNIX socket diagnostics.") +Reported-by: syzbot +Reported-by: Wei Chen +Diagnosed-by: Paolo Abeni +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/unix/diag.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/net/unix/diag.c b/net/unix/diag.c +index 9ff64f9df1f3..951b33fa8f5c 100644 +--- a/net/unix/diag.c ++++ b/net/unix/diag.c +@@ -113,14 +113,16 @@ static int sk_diag_show_rqlen(struct sock *sk, struct sk_buff *nlskb) + return nla_put(nlskb, UNIX_DIAG_RQLEN, sizeof(rql), &rql); + } + +-static int sk_diag_dump_uid(struct sock *sk, struct sk_buff *nlskb) ++static int sk_diag_dump_uid(struct sock *sk, struct sk_buff *nlskb, ++ struct user_namespace *user_ns) + { +- uid_t uid = from_kuid_munged(sk_user_ns(nlskb->sk), sock_i_uid(sk)); ++ uid_t uid = from_kuid_munged(user_ns, sock_i_uid(sk)); + return nla_put(nlskb, UNIX_DIAG_UID, sizeof(uid_t), &uid); + } + + static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req, +- u32 portid, u32 seq, u32 flags, int sk_ino) ++ struct user_namespace *user_ns, ++ u32 portid, u32 seq, u32 flags, int sk_ino) + { + struct nlmsghdr *nlh; + struct unix_diag_msg *rep; +@@ -166,7 +168,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r + goto out_nlmsg_trim; + + if ((req->udiag_show & UDIAG_SHOW_UID) && +- sk_diag_dump_uid(sk, skb)) ++ sk_diag_dump_uid(sk, skb, user_ns)) + goto out_nlmsg_trim; + + nlmsg_end(skb, nlh); +@@ -178,7 +180,8 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r + } + + static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req, +- u32 portid, u32 seq, u32 flags) ++ struct user_namespace *user_ns, ++ u32 portid, u32 seq, u32 flags) + { + int sk_ino; + +@@ -189,7 +192,7 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, struct unix_diag_r + if (!sk_ino) + return 0; + +- return sk_diag_fill(sk, skb, req, portid, seq, flags, sk_ino); ++ return sk_diag_fill(sk, skb, req, user_ns, portid, seq, flags, sk_ino); + } + + static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) +@@ -217,7 +220,7 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) + goto next; + if (!(req->udiag_states & (1 << sk->sk_state))) + goto next; +- if (sk_diag_dump(sk, skb, req, ++ if (sk_diag_dump(sk, skb, req, sk_user_ns(skb->sk), + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, + NLM_F_MULTI) < 0) +@@ -285,7 +288,8 @@ static int unix_diag_get_exact(struct sk_buff *in_skb, + if (!rep) + goto out; + +- err = sk_diag_fill(sk, rep, req, NETLINK_CB(in_skb).portid, ++ err = sk_diag_fill(sk, rep, req, sk_user_ns(NETLINK_CB(in_skb).sk), ++ NETLINK_CB(in_skb).portid, + nlh->nlmsg_seq, 0, req->udiag_ino); + if (err < 0) { + nlmsg_free(rep); +-- +2.35.1 + diff --git a/queue-5.10/bluetooth-6lowpan-add-missing-hci_dev_put-in-get_l2c.patch b/queue-5.10/bluetooth-6lowpan-add-missing-hci_dev_put-in-get_l2c.patch new file mode 100644 index 00000000000..00afad2f6ef --- /dev/null +++ b/queue-5.10/bluetooth-6lowpan-add-missing-hci_dev_put-in-get_l2c.patch @@ -0,0 +1,35 @@ +From be9b43649f78556aaf27eb68dfed1c0c406de5c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Nov 2022 17:37:26 +0800 +Subject: Bluetooth: 6LoWPAN: add missing hci_dev_put() in get_l2cap_conn() + +From: Wang ShaoBo + +[ Upstream commit 747da1308bdd5021409974f9180f0d8ece53d142 ] + +hci_get_route() takes reference, we should use hci_dev_put() to release +it when not need anymore. + +Fixes: 6b8d4a6a0314 ("Bluetooth: 6LoWPAN: Use connected oriented channel instead of fixed one") +Signed-off-by: Wang ShaoBo +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/6lowpan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c +index cff4944d5b66..7601ce9143c1 100644 +--- a/net/bluetooth/6lowpan.c ++++ b/net/bluetooth/6lowpan.c +@@ -1010,6 +1010,7 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type, + hci_dev_lock(hdev); + hcon = hci_conn_hash_lookup_le(hdev, addr, *addr_type); + hci_dev_unlock(hdev); ++ hci_dev_put(hdev); + + if (!hcon) + return -ENOENT; +-- +2.35.1 + diff --git a/queue-5.10/bluetooth-fix-not-cleanup-led-when-bt_init-fails.patch b/queue-5.10/bluetooth-fix-not-cleanup-led-when-bt_init-fails.patch new file mode 100644 index 00000000000..41dad3e2027 --- /dev/null +++ b/queue-5.10/bluetooth-fix-not-cleanup-led-when-bt_init-fails.patch @@ -0,0 +1,57 @@ +From b3ece8102fc8a6824e2ebc7005467470e0025dda Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Nov 2022 17:25:56 +0800 +Subject: Bluetooth: Fix not cleanup led when bt_init fails + +From: Chen Zhongjin + +[ Upstream commit 2f3957c7eb4e07df944169a3e50a4d6790e1c744 ] + +bt_init() calls bt_leds_init() to register led, but if it fails later, +bt_leds_cleanup() is not called to unregister it. + +This can cause panic if the argument "bluetooth-power" in text is freed +and then another led_trigger_register() tries to access it: + +BUG: unable to handle page fault for address: ffffffffc06d3bc0 +RIP: 0010:strcmp+0xc/0x30 + Call Trace: + + led_trigger_register+0x10d/0x4f0 + led_trigger_register_simple+0x7d/0x100 + bt_init+0x39/0xf7 [bluetooth] + do_one_initcall+0xd0/0x4e0 + +Fixes: e64c97b53bc6 ("Bluetooth: Add combined LED trigger for controller power") +Signed-off-by: Chen Zhongjin +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/af_bluetooth.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c +index 4ef6a54403aa..2f87f57e7a4f 100644 +--- a/net/bluetooth/af_bluetooth.c ++++ b/net/bluetooth/af_bluetooth.c +@@ -736,7 +736,7 @@ static int __init bt_init(void) + + err = bt_sysfs_init(); + if (err < 0) +- return err; ++ goto cleanup_led; + + err = sock_register(&bt_sock_family_ops); + if (err) +@@ -772,6 +772,8 @@ static int __init bt_init(void) + sock_unregister(PF_BLUETOOTH); + cleanup_sysfs: + bt_sysfs_cleanup(); ++cleanup_led: ++ bt_leds_cleanup(); + return err; + } + +-- +2.35.1 + diff --git a/queue-5.10/ca8210-fix-crash-by-zero-initializing-data.patch b/queue-5.10/ca8210-fix-crash-by-zero-initializing-data.patch new file mode 100644 index 00000000000..95090d97b91 --- /dev/null +++ b/queue-5.10/ca8210-fix-crash-by-zero-initializing-data.patch @@ -0,0 +1,40 @@ +From ccb77d5f08dd4164fb8e8ccc5b9f0bc61573f13f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Nov 2022 01:22:01 +0100 +Subject: ca8210: Fix crash by zero initializing data + +From: Hauke Mehrtens + +[ Upstream commit 1e24c54da257ab93cff5826be8a793b014a5dc9c ] + +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 +Link: https://lore.kernel.org/r/20221121002201.1339636-1-hauke@hauke-m.de +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + drivers/net/ieee802154/ca8210.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c +index fd9f33c833fa..95ef3b6f98dd 100644 +--- 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; + +-- +2.35.1 + diff --git a/queue-5.10/can-esd_usb-allow-rec-and-tec-to-return-to-zero.patch b/queue-5.10/can-esd_usb-allow-rec-and-tec-to-return-to-zero.patch new file mode 100644 index 00000000000..79a514c0fc8 --- /dev/null +++ b/queue-5.10/can-esd_usb-allow-rec-and-tec-to-return-to-zero.patch @@ -0,0 +1,55 @@ +From 59fe01a0cd4a74e2849548c5b99ad26ad6c39c8b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Nov 2022 21:22:42 +0100 +Subject: can: esd_usb: Allow REC and TEC to return to zero + +From: Frank Jungclaus + +[ Upstream commit 918ee4911f7a41fb4505dff877c1d7f9f64eb43e ] + +We don't get any further EVENT from an esd CAN USB device for changes +on REC or TEC while those counters converge to 0 (with ecc == 0). So +when handling the "Back to Error Active"-event force txerr = rxerr = +0, otherwise the berr-counters might stay on values like 95 forever. + +Also, to make life easier during the ongoing development a +netdev_dbg() has been introduced to allow dumping error events send by +an esd CAN USB device. + +Fixes: 96d8e90382dc ("can: Add driver for esd CAN-USB/2 device") +Signed-off-by: Frank Jungclaus +Link: https://lore.kernel.org/all/20221130202242.3998219-2-frank.jungclaus@esd.eu +Cc: stable@vger.kernel.org +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + drivers/net/can/usb/esd_usb2.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c +index 8847942a8d97..73c5343e609b 100644 +--- a/drivers/net/can/usb/esd_usb2.c ++++ b/drivers/net/can/usb/esd_usb2.c +@@ -227,6 +227,10 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, + u8 rxerr = msg->msg.rx.data[2]; + u8 txerr = msg->msg.rx.data[3]; + ++ netdev_dbg(priv->netdev, ++ "CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n", ++ msg->msg.rx.dlc, state, ecc, rxerr, txerr); ++ + skb = alloc_can_err_skb(priv->netdev, &cf); + if (skb == NULL) { + stats->rx_dropped++; +@@ -253,6 +257,8 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, + break; + default: + priv->can.state = CAN_STATE_ERROR_ACTIVE; ++ txerr = 0; ++ rxerr = 0; + break; + } + } else { +-- +2.35.1 + diff --git a/queue-5.10/drm-bridge-dw_hdmi-fix-preference-of-rgb-modes-over-.patch b/queue-5.10/drm-bridge-dw_hdmi-fix-preference-of-rgb-modes-over-.patch new file mode 100644 index 00000000000..8e5097165af --- /dev/null +++ b/queue-5.10/drm-bridge-dw_hdmi-fix-preference-of-rgb-modes-over-.patch @@ -0,0 +1,56 @@ +From de1258bf134e4e85aa9700ff2262f4cccd49c94d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Nov 2022 15:35:23 +0100 +Subject: drm: bridge: dw_hdmi: fix preference of RGB modes over YUV420 + +From: Guillaume BRUN + +[ Upstream commit d3d6b1bf85aefe0ebc0624574b3bb62f0693914c ] + +Cheap monitors sometimes advertise YUV modes they don't really have +(HDMI specification mandates YUV support so even monitors without actual +support will often wrongfully advertise it) which results in YUV matches +and user forum complaints of a red tint to light colour display areas in +common desktop environments. + +Moving the default RGB fall-back before YUV selection results in RGB +mode matching in most cases, reducing complaints. + +Fixes: 6c3c719936da ("drm/bridge: synopsys: dw-hdmi: add bus format negociation") +Signed-off-by: Guillaume BRUN +Tested-by: Christian Hewitt +Reviewed-by: Robert Foss +Signed-off-by: Neil Armstrong +Link: https://patchwork.freedesktop.org/patch/msgid/20221116143523.2126-1-the.cheaterman@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +index 356c7d0bd035..2c3c743df950 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +@@ -2609,6 +2609,9 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, + * if supported. In any case the default RGB888 format is added + */ + ++ /* Default 8bit RGB fallback */ ++ output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; ++ + if (max_bpc >= 16 && info->bpc == 16) { + if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444) + output_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48; +@@ -2642,9 +2645,6 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, + if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444) + output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; + +- /* Default 8bit RGB fallback */ +- output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; +- + *num_output_fmts = i; + + return output_fmts; +-- +2.35.1 + diff --git a/queue-5.10/drm-bridge-ti-sn65dsi86-fix-output-polarity-setting-.patch b/queue-5.10/drm-bridge-ti-sn65dsi86-fix-output-polarity-setting-.patch new file mode 100644 index 00000000000..25bc34bfa3a --- /dev/null +++ b/queue-5.10/drm-bridge-ti-sn65dsi86-fix-output-polarity-setting-.patch @@ -0,0 +1,56 @@ +From c1761a65be5d584878121423791628ef51be22ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Nov 2022 18:45:58 +0800 +Subject: drm/bridge: ti-sn65dsi86: Fix output polarity setting bug + +From: Qiqi Zhang + +[ Upstream commit 8c115864501fc09932cdfec53d9ec1cde82b4a28 ] + +According to the description in ti-sn65dsi86's datasheet: + +CHA_HSYNC_POLARITY: +0 = Active High Pulse. Synchronization signal is high for the sync +pulse width. (default) +1 = Active Low Pulse. Synchronization signal is low for the sync +pulse width. + +CHA_VSYNC_POLARITY: +0 = Active High Pulse. Synchronization signal is high for the sync +pulse width. (Default) +1 = Active Low Pulse. Synchronization signal is low for the sync +pulse width. + +We should only set these bits when the polarity is negative. + +Fixes: a095f15c00e2 ("drm/bridge: add support for sn65dsi86 bridge driver") +Signed-off-by: Qiqi Zhang +Reviewed-by: Douglas Anderson +Tested-by: Douglas Anderson +Reviewed-by: Tomi Valkeinen +Signed-off-by: Douglas Anderson +Link: https://patchwork.freedesktop.org/patch/msgid/20221125104558.84616-1-eddy.zhang@rock-chips.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c +index 1a58481037b3..77a447a3fb1d 100644 +--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c ++++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c +@@ -621,9 +621,9 @@ static void ti_sn_bridge_set_video_timings(struct ti_sn_bridge *pdata) + &pdata->bridge.encoder->crtc->state->adjusted_mode; + u8 hsync_polarity = 0, vsync_polarity = 0; + +- if (mode->flags & DRM_MODE_FLAG_PHSYNC) ++ if (mode->flags & DRM_MODE_FLAG_NHSYNC) + hsync_polarity = CHA_HSYNC_POLARITY; +- if (mode->flags & DRM_MODE_FLAG_PVSYNC) ++ if (mode->flags & DRM_MODE_FLAG_NVSYNC) + vsync_polarity = CHA_VSYNC_POLARITY; + + ti_sn_bridge_write_u16(pdata, SN_CHA_ACTIVE_LINE_LENGTH_LOW_REG, +-- +2.35.1 + diff --git a/queue-5.10/e1000e-fix-tx-dispatch-condition.patch b/queue-5.10/e1000e-fix-tx-dispatch-condition.patch new file mode 100644 index 00000000000..cafc09f227c --- /dev/null +++ b/queue-5.10/e1000e-fix-tx-dispatch-condition.patch @@ -0,0 +1,67 @@ +From d2b5c985afa12acc5cceb7d88e634ed5b99fd3fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 Oct 2022 22:00:00 +0900 +Subject: e1000e: Fix TX dispatch condition + +From: Akihiko Odaki + +[ Upstream commit eed913f6919e253f35d454b2f115f2a4db2b741a ] + +e1000_xmit_frame is expected to stop the queue and dispatch frames to +hardware if there is not sufficient space for the next frame in the +buffer, but sometimes it failed to do so because the estimated maximum +size of frame was wrong. As the consequence, the later invocation of +e1000_xmit_frame failed with NETDEV_TX_BUSY, and the frame in the buffer +remained forever, resulting in a watchdog failure. + +This change fixes the estimated size by making it match with the +condition for NETDEV_TX_BUSY. Apparently, the old estimation failed to +account for the following lines which determines the space requirement +for not causing NETDEV_TX_BUSY: + ``` + /* reserve a descriptor for the offload context */ + if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL)) + count++; + count++; + + count += DIV_ROUND_UP(len, adapter->tx_fifo_limit); + ``` + +This issue was found when running http-stress02 test included in Linux +Test Project 20220930 on QEMU with the following commandline: +``` +qemu-system-x86_64 -M q35,accel=kvm -m 8G -smp 8 + -drive if=virtio,format=raw,file=root.img,file.locking=on + -device e1000e,netdev=netdev + -netdev tap,script=ifup,downscript=no,id=netdev +``` + +Fixes: bc7f75fa9788 ("[E1000E]: New pci-express e1000 driver (currently for ICH9 devices only)") +Signed-off-by: Akihiko Odaki +Tested-by: Gurucharan G (A Contingent worker at Intel) +Tested-by: Naama Meir +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c +index d0c4de023112..ae0c9aaab48d 100644 +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -5937,9 +5937,9 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, + e1000_tx_queue(tx_ring, tx_flags, count); + /* Make sure there is space in the ring for the next send. */ + e1000_maybe_stop_tx(tx_ring, +- (MAX_SKB_FRAGS * ++ ((MAX_SKB_FRAGS + 1) * + DIV_ROUND_UP(PAGE_SIZE, +- adapter->tx_fifo_limit) + 2)); ++ adapter->tx_fifo_limit) + 4)); + + if (!netdev_xmit_more() || + netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) { +-- +2.35.1 + diff --git a/queue-5.10/ethernet-aeroflex-fix-potential-skb-leak-in-greth_in.patch b/queue-5.10/ethernet-aeroflex-fix-potential-skb-leak-in-greth_in.patch new file mode 100644 index 00000000000..825165810d4 --- /dev/null +++ b/queue-5.10/ethernet-aeroflex-fix-potential-skb-leak-in-greth_in.patch @@ -0,0 +1,39 @@ +From c96ac9ee0cb6261ec40c53c19a0378a1ef734086 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 4 Dec 2022 14:09:08 +0800 +Subject: ethernet: aeroflex: fix potential skb leak in greth_init_rings() + +From: Zhang Changzhong + +[ Upstream commit 063a932b64db3317ec020c94466fe52923a15f60 ] + +The greth_init_rings() function won't free the newly allocated skb when +dma_mapping_error() returns error, so add dev_kfree_skb() to fix it. + +Compile tested only. + +Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver") +Signed-off-by: Zhang Changzhong +Reviewed-by: Leon Romanovsky +Link: https://lore.kernel.org/r/1670134149-29516-1-git-send-email-zhangchangzhong@huawei.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/aeroflex/greth.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c +index f4f50b3a472e..0d56cb4f5dd9 100644 +--- a/drivers/net/ethernet/aeroflex/greth.c ++++ b/drivers/net/ethernet/aeroflex/greth.c +@@ -258,6 +258,7 @@ static int greth_init_rings(struct greth_private *greth) + if (dma_mapping_error(greth->dev, dma_addr)) { + if (netif_msg_ifup(greth)) + dev_err(greth->dev, "Could not create initial DMA mapping\n"); ++ dev_kfree_skb(skb); + goto cleanup; + } + greth->rx_skbuff[i] = skb; +-- +2.35.1 + diff --git a/queue-5.10/gpio-amd8111-fix-pci-device-reference-count-leak.patch b/queue-5.10/gpio-amd8111-fix-pci-device-reference-count-leak.patch new file mode 100644 index 00000000000..ee8299742fa --- /dev/null +++ b/queue-5.10/gpio-amd8111-fix-pci-device-reference-count-leak.patch @@ -0,0 +1,54 @@ +From 0b69309f5619efb981880883f0a922051a6a6f05 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 22 Nov 2022 20:35:08 +0800 +Subject: gpio: amd8111: Fix PCI device reference count leak + +From: Xiongfeng Wang + +[ Upstream commit 45fecdb9f658d9c82960c98240bc0770ade19aca ] + +for_each_pci_dev() is implemented by pci_get_device(). The comment of +pci_get_device() says that it will increase the reference count for the +returned pci_dev and also decrease the reference count for the input +pci_dev @from if it is not NULL. + +If we break for_each_pci_dev() loop with pdev not NULL, we need to call +pci_dev_put() to decrease the reference count. Add the missing +pci_dev_put() after the 'out' label. Since pci_dev_put() can handle NULL +input parameter, there is no problem for the 'Device not found' branch. +For the normal path, add pci_dev_put() in amd_gpio_exit(). + +Fixes: f942a7de047d ("gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips") +Signed-off-by: Xiongfeng Wang +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-amd8111.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c +index fdcebe59510d..68d95051dd0e 100644 +--- a/drivers/gpio/gpio-amd8111.c ++++ b/drivers/gpio/gpio-amd8111.c +@@ -231,7 +231,10 @@ static int __init amd_gpio_init(void) + ioport_unmap(gp.pm); + goto out; + } ++ return 0; ++ + out: ++ pci_dev_put(pdev); + return err; + } + +@@ -239,6 +242,7 @@ static void __exit amd_gpio_exit(void) + { + gpiochip_remove(&gp.chip); + ioport_unmap(gp.pm); ++ pci_dev_put(gp.pdev); + } + + module_init(amd_gpio_init); +-- +2.35.1 + diff --git a/queue-5.10/i40e-disallow-ip4-and-ip6-l4_4_bytes.patch b/queue-5.10/i40e-disallow-ip4-and-ip6-l4_4_bytes.patch new file mode 100644 index 00000000000..f3d0d847e4b --- /dev/null +++ b/queue-5.10/i40e-disallow-ip4-and-ip6-l4_4_bytes.patch @@ -0,0 +1,46 @@ +From bb95e8caa13d5e58798229b48f7bdde4ee89d919 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Nov 2022 09:49:25 +0100 +Subject: i40e: Disallow ip4 and ip6 l4_4_bytes + +From: Przemyslaw Patynowski + +[ Upstream commit d64aaf3f7869f915fd120763d75f11d6b116424d ] + +Return -EOPNOTSUPP, when user requests l4_4_bytes for raw IP4 or +IP6 flow director filters. Flow director does not support filtering +on l4 bytes for PCTYPEs used by IP4 and IP6 filters. +Without this patch, user could create filters with l4_4_bytes fields, +which did not do any filtering on L4, but only on L3 fields. + +Fixes: 36777d9fa24c ("i40e: check current configured input set when adding ntuple filters") +Signed-off-by: Przemyslaw Patynowski +Signed-off-by: Kamil Maziarz +Reviewed-by: Jacob Keller +Tested-by: Gurucharan G (A Contingent worker at Intel) +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +index 144c4824b5e8..520929f4d535 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +@@ -4234,11 +4234,7 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi, + return -EOPNOTSUPP; + + /* First 4 bytes of L4 header */ +- if (usr_ip4_spec->l4_4_bytes == htonl(0xFFFFFFFF)) +- new_mask |= I40E_L4_SRC_MASK | I40E_L4_DST_MASK; +- else if (!usr_ip4_spec->l4_4_bytes) +- new_mask &= ~(I40E_L4_SRC_MASK | I40E_L4_DST_MASK); +- else ++ if (usr_ip4_spec->l4_4_bytes) + return -EOPNOTSUPP; + + /* Filtering on Type of Service is not supported. */ +-- +2.35.1 + diff --git a/queue-5.10/i40e-fix-for-vf-mac-address-0.patch b/queue-5.10/i40e-fix-for-vf-mac-address-0.patch new file mode 100644 index 00000000000..8ee5691b1b8 --- /dev/null +++ b/queue-5.10/i40e-fix-for-vf-mac-address-0.patch @@ -0,0 +1,49 @@ +From 79c2b7a2903febfee3e357334226d1074decdc7a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 Oct 2022 13:00:28 +0100 +Subject: i40e: Fix for VF MAC address 0 + +From: Sylwester Dziedziuch + +[ Upstream commit 08501970472077ed5de346ad89943a37d1692e9b ] + +After spawning max VFs on a PF, some VFs were not getting resources and +their MAC addresses were 0. This was caused by PF sleeping before flushing +HW registers which caused VIRTCHNL_VFR_VFACTIVE to not be set in time for +VF. + +Fix by adding a sleep after hw flush. + +Fixes: e4b433f4a741 ("i40e: reset all VFs in parallel when rebuilding PF") +Signed-off-by: Sylwester Dziedziuch +Signed-off-by: Jan Sokolowski +Tested-by: Konrad Jankowski +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +index 381b28a08746..bb2a79b70c3a 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +@@ -1525,6 +1525,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) + i40e_cleanup_reset_vf(vf); + + i40e_flush(hw); ++ usleep_range(20000, 40000); + clear_bit(I40E_VF_STATE_RESETTING, &vf->vf_states); + + return true; +@@ -1648,6 +1649,7 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) + } + + i40e_flush(hw); ++ usleep_range(20000, 40000); + clear_bit(__I40E_VF_DISABLE, pf->state); + + return true; +-- +2.35.1 + diff --git a/queue-5.10/i40e-fix-not-setting-default-xps_cpus-after-reset.patch b/queue-5.10/i40e-fix-not-setting-default-xps_cpus-after-reset.patch new file mode 100644 index 00000000000..75fb810c41c --- /dev/null +++ b/queue-5.10/i40e-fix-not-setting-default-xps_cpus-after-reset.patch @@ -0,0 +1,72 @@ +From fe97245c6ce1ea942fd78a9d313cb57dada0ed51 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Oct 2022 10:19:42 +0200 +Subject: i40e: Fix not setting default xps_cpus after reset + +From: Michal Jaron + +[ Upstream commit 82e0572b23029b380464fa9fdc125db9c1506d0a ] + +During tx rings configuration default XPS queue config is set and +__I40E_TX_XPS_INIT_DONE is locked. __I40E_TX_XPS_INIT_DONE state is +cleared and set again with default mapping only during queues build, +it means after first setup or reset with queues rebuild. (i.e. +ethtool -L combined ) After other resets (i.e. +ethtool -t ) XPS_INIT_DONE is not cleared and those default +maps cannot be set again. It results in cleared xps_cpus mapping +until queues are not rebuild or mapping is not set by user. + +Add clearing __I40E_TX_XPS_INIT_DONE state during reset to let +the driver set xps_cpus to defaults again after it was cleared. + +Fixes: 6f853d4f8e93 ("i40e: allow XPS with QoS enabled") +Signed-off-by: Michal Jaron +Signed-off-by: Kamil Maziarz +Tested-by: Gurucharan (A Contingent worker at Intel) +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c +index d7ddf9239e51..2c60d2a93330 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_main.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_main.c +@@ -10065,6 +10065,21 @@ static int i40e_rebuild_channels(struct i40e_vsi *vsi) + return 0; + } + ++/** ++ * i40e_clean_xps_state - clean xps state for every tx_ring ++ * @vsi: ptr to the VSI ++ **/ ++static void i40e_clean_xps_state(struct i40e_vsi *vsi) ++{ ++ int i; ++ ++ if (vsi->tx_rings) ++ for (i = 0; i < vsi->num_queue_pairs; i++) ++ if (vsi->tx_rings[i]) ++ clear_bit(__I40E_TX_XPS_INIT_DONE, ++ vsi->tx_rings[i]->state); ++} ++ + /** + * i40e_prep_for_reset - prep for the core to reset + * @pf: board private structure +@@ -10096,8 +10111,10 @@ static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired) + rtnl_unlock(); + + for (v = 0; v < pf->num_alloc_vsi; v++) { +- if (pf->vsi[v]) ++ if (pf->vsi[v]) { ++ i40e_clean_xps_state(pf->vsi[v]); + pf->vsi[v]->seid = 0; ++ } + } + + i40e_shutdown_adminq(&pf->hw); +-- +2.35.1 + diff --git a/queue-5.10/ieee802154-cc2520-fix-error-return-code-in-cc2520_hw.patch b/queue-5.10/ieee802154-cc2520-fix-error-return-code-in-cc2520_hw.patch new file mode 100644 index 00000000000..c816a010faf --- /dev/null +++ b/queue-5.10/ieee802154-cc2520-fix-error-return-code-in-cc2520_hw.patch @@ -0,0 +1,37 @@ +From 056945168da1382099951965b9f9fb5df9ad8ae5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Nov 2022 15:50:46 +0800 +Subject: ieee802154: cc2520: Fix error return code in cc2520_hw_init() + +From: Ziyang Xuan + +[ Upstream commit 4d002d6a2a00ac1c433899bd7625c6400a74cfba ] + +In cc2520_hw_init(), if oscillator start failed, the error code +should be returned. + +Fixes: 0da6bc8cc341 ("ieee802154: cc2520: adds driver for TI CC2520 radio") +Signed-off-by: Ziyang Xuan +Link: https://lore.kernel.org/r/20221120075046.2213633-1-william.xuanziyang@huawei.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + drivers/net/ieee802154/cc2520.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c +index 4517517215f2..a8369bfa4050 100644 +--- a/drivers/net/ieee802154/cc2520.c ++++ b/drivers/net/ieee802154/cc2520.c +@@ -970,7 +970,7 @@ static int cc2520_hw_init(struct cc2520_private *priv) + + if (timeout-- <= 0) { + dev_err(&priv->spi->dev, "oscillator start failed!\n"); +- return ret; ++ return -ETIMEDOUT; + } + udelay(1); + } while (!(status & CC2520_STATUS_XOSC32M_STABLE)); +-- +2.35.1 + diff --git a/queue-5.10/igb-allocate-msi-x-vector-when-testing.patch b/queue-5.10/igb-allocate-msi-x-vector-when-testing.patch new file mode 100644 index 00000000000..8c4dd3c48a1 --- /dev/null +++ b/queue-5.10/igb-allocate-msi-x-vector-when-testing.patch @@ -0,0 +1,69 @@ +From a60d58e2e8936f872394a377b1ecab25cbaaa648 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Nov 2022 22:30:31 +0900 +Subject: igb: Allocate MSI-X vector when testing + +From: Akihiko Odaki + +[ Upstream commit 28e96556baca7056d11d9fb3cdd0aba4483e00d8 ] + +Without this change, the interrupt test fail with MSI-X environment: + +$ sudo ethtool -t enp0s2 offline +[ 43.921783] igb 0000:00:02.0: offline testing starting +[ 44.855824] igb 0000:00:02.0 enp0s2: igb: enp0s2 NIC Link is Down +[ 44.961249] igb 0000:00:02.0 enp0s2: igb: enp0s2 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX/TX +[ 51.272202] igb 0000:00:02.0: testing shared interrupt +[ 56.996975] igb 0000:00:02.0 enp0s2: igb: enp0s2 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX/TX +The test result is FAIL +The test extra info: +Register test (offline) 0 +Eeprom test (offline) 0 +Interrupt test (offline) 4 +Loopback test (offline) 0 +Link test (on/offline) 0 + +Here, "4" means an expected interrupt was not delivered. + +To fix this, route IRQs correctly to the first MSI-X vector by setting +IVAR_MISC. Also, set bit 0 of EIMS so that the vector will not be +masked. The interrupt test now runs properly with this change: + +$ sudo ethtool -t enp0s2 offline +[ 42.762985] igb 0000:00:02.0: offline testing starting +[ 50.141967] igb 0000:00:02.0: testing shared interrupt +[ 56.163957] igb 0000:00:02.0 enp0s2: igb: enp0s2 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX/TX +The test result is PASS +The test extra info: +Register test (offline) 0 +Eeprom test (offline) 0 +Interrupt test (offline) 0 +Loopback test (offline) 0 +Link test (on/offline) 0 + +Fixes: 4eefa8f01314 ("igb: add single vector msi-x testing to interrupt test") +Signed-off-by: Akihiko Odaki +Reviewed-by: Maciej Fijalkowski +Tested-by: Gurucharan G (A Contingent worker at Intel) +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c +index 28baf203459a..5e3b0a5843a8 100644 +--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c ++++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c +@@ -1413,6 +1413,8 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) + *data = 1; + return -1; + } ++ wr32(E1000_IVAR_MISC, E1000_IVAR_VALID << 8); ++ wr32(E1000_EIMS, BIT(0)); + } else if (adapter->flags & IGB_FLAG_HAS_MSI) { + shared_int = false; + if (request_irq(irq, +-- +2.35.1 + diff --git a/queue-5.10/ip_gre-do-not-report-erspan-version-on-gre-interface.patch b/queue-5.10/ip_gre-do-not-report-erspan-version-on-gre-interface.patch new file mode 100644 index 00000000000..73cfba418d9 --- /dev/null +++ b/queue-5.10/ip_gre-do-not-report-erspan-version-on-gre-interface.patch @@ -0,0 +1,104 @@ +From 609268fbf23e9cf5e900c6452b15edf6ffa8656f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 11:28:58 +0800 +Subject: ip_gre: do not report erspan version on GRE interface + +From: Hangbin Liu + +[ Upstream commit ee496694b9eea651ae1aa4c4667d886cdf74aa3b ] + +Although the type I ERSPAN is based on the barebones IP + GRE +encapsulation and no extra ERSPAN header. Report erspan version on GRE +interface looks unreasonable. Fix this by separating the erspan and gre +fill info. + +IPv6 GRE does not have this info as IPv6 only supports erspan version +1 and 2. + +Reported-by: Jianlin Shi +Fixes: f989d546a2d5 ("erspan: Add type I version 0 support.") +Signed-off-by: Hangbin Liu +Acked-by: William Tu +Link: https://lore.kernel.org/r/20221203032858.3130339-1-liuhangbin@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/ipv4/ip_gre.c | 48 ++++++++++++++++++++++++++++------------------- + 1 file changed, 29 insertions(+), 19 deletions(-) + +diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c +index 6ab5c50aa7a8..65ead8a74933 100644 +--- a/net/ipv4/ip_gre.c ++++ b/net/ipv4/ip_gre.c +@@ -1493,24 +1493,6 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) + struct ip_tunnel_parm *p = &t->parms; + __be16 o_flags = p->o_flags; + +- if (t->erspan_ver <= 2) { +- if (t->erspan_ver != 0 && !t->collect_md) +- o_flags |= TUNNEL_KEY; +- +- if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, t->erspan_ver)) +- goto nla_put_failure; +- +- if (t->erspan_ver == 1) { +- if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, t->index)) +- goto nla_put_failure; +- } else if (t->erspan_ver == 2) { +- if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, t->dir)) +- goto nla_put_failure; +- if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, t->hwid)) +- goto nla_put_failure; +- } +- } +- + if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) || + nla_put_be16(skb, IFLA_GRE_IFLAGS, + gre_tnl_flags_to_gre_flags(p->i_flags)) || +@@ -1551,6 +1533,34 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) + return -EMSGSIZE; + } + ++static int erspan_fill_info(struct sk_buff *skb, const struct net_device *dev) ++{ ++ struct ip_tunnel *t = netdev_priv(dev); ++ ++ if (t->erspan_ver <= 2) { ++ if (t->erspan_ver != 0 && !t->collect_md) ++ t->parms.o_flags |= TUNNEL_KEY; ++ ++ if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, t->erspan_ver)) ++ goto nla_put_failure; ++ ++ if (t->erspan_ver == 1) { ++ if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, t->index)) ++ goto nla_put_failure; ++ } else if (t->erspan_ver == 2) { ++ if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, t->dir)) ++ goto nla_put_failure; ++ if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, t->hwid)) ++ goto nla_put_failure; ++ } ++ } ++ ++ return ipgre_fill_info(skb, dev); ++ ++nla_put_failure: ++ return -EMSGSIZE; ++} ++ + static void erspan_setup(struct net_device *dev) + { + struct ip_tunnel *t = netdev_priv(dev); +@@ -1629,7 +1639,7 @@ static struct rtnl_link_ops erspan_link_ops __read_mostly = { + .changelink = erspan_changelink, + .dellink = ip_tunnel_dellink, + .get_size = ipgre_get_size, +- .fill_info = ipgre_fill_info, ++ .fill_info = erspan_fill_info, + .get_link_net = ip_tunnel_get_link_net, + }; + +-- +2.35.1 + diff --git a/queue-5.10/ipv4-fix-incorrect-route-flushing-when-source-addres.patch b/queue-5.10/ipv4-fix-incorrect-route-flushing-when-source-addres.patch new file mode 100644 index 00000000000..dc2aca39bca --- /dev/null +++ b/queue-5.10/ipv4-fix-incorrect-route-flushing-when-source-addres.patch @@ -0,0 +1,134 @@ +From d9950abceeed19091e30e8c830b298051ff53d25 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 4 Dec 2022 09:50:44 +0200 +Subject: ipv4: Fix incorrect route flushing when source address is deleted + +From: Ido Schimmel + +[ Upstream commit f96a3d74554df537b6db5c99c27c80e7afadc8d1 ] + +Cited commit added the table ID to the FIB info structure, but did not +prevent structures with different table IDs from being consolidated. +This can lead to routes being flushed from a VRF when an address is +deleted from a different VRF. + +Fix by taking the table ID into account when looking for a matching FIB +info. This is already done for FIB info structures backed by a nexthop +object in fib_find_info_nh(). + +Add test cases that fail before the fix: + + # ./fib_tests.sh -t ipv4_del_addr + + IPv4 delete address route tests + Regular FIB info + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + Identical FIB info with different table ID + TEST: Route removed from VRF when source address deleted [FAIL] + TEST: Route in default VRF not removed [ OK ] + RTNETLINK answers: File exists + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [FAIL] + + Tests passed: 6 + Tests failed: 2 + +And pass after: + + # ./fib_tests.sh -t ipv4_del_addr + + IPv4 delete address route tests + Regular FIB info + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + Identical FIB info with different table ID + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + + Tests passed: 8 + Tests failed: 0 + +Fixes: 5a56a0b3a45d ("net: Don't delete routes in different VRFs") +Signed-off-by: Ido Schimmel +Reviewed-by: David Ahern +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/fib_semantics.c | 1 + + tools/testing/selftests/net/fib_tests.sh | 27 ++++++++++++++++++++++++ + 2 files changed, 28 insertions(+) + +diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c +index 52ec0c43e6b8..ab9fcc6231b8 100644 +--- a/net/ipv4/fib_semantics.c ++++ b/net/ipv4/fib_semantics.c +@@ -423,6 +423,7 @@ static struct fib_info *fib_find_info(struct fib_info *nfi) + nfi->fib_prefsrc == fi->fib_prefsrc && + nfi->fib_priority == fi->fib_priority && + nfi->fib_type == fi->fib_type && ++ nfi->fib_tb_id == fi->fib_tb_id && + memcmp(nfi->fib_metrics, fi->fib_metrics, + sizeof(u32) * RTAX_MAX) == 0 && + !((nfi->fib_flags ^ fi->fib_flags) & ~RTNH_COMPARE_MASK) && +diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh +index a7f53c2a9580..a7b40dc56cae 100755 +--- a/tools/testing/selftests/net/fib_tests.sh ++++ b/tools/testing/selftests/net/fib_tests.sh +@@ -1622,13 +1622,19 @@ ipv4_del_addr_test() + + $IP addr add dev dummy1 172.16.104.1/24 + $IP addr add dev dummy1 172.16.104.11/24 ++ $IP addr add dev dummy1 172.16.104.12/24 + $IP addr add dev dummy2 172.16.104.1/24 + $IP addr add dev dummy2 172.16.104.11/24 ++ $IP addr add dev dummy2 172.16.104.12/24 + $IP route add 172.16.105.0/24 via 172.16.104.2 src 172.16.104.11 ++ $IP route add 172.16.106.0/24 dev lo src 172.16.104.12 + $IP route add vrf red 172.16.105.0/24 via 172.16.104.2 src 172.16.104.11 ++ $IP route add vrf red 172.16.106.0/24 dev lo src 172.16.104.12 + set +e + + # removing address from device in vrf should only remove route from vrf table ++ echo " Regular FIB info" ++ + $IP addr del dev dummy2 172.16.104.11/24 + $IP ro ls vrf red | grep -q 172.16.105.0/24 + log_test $? 1 "Route removed from VRF when source address deleted" +@@ -1646,6 +1652,27 @@ ipv4_del_addr_test() + $IP ro ls vrf red | grep -q 172.16.105.0/24 + log_test $? 0 "Route in VRF is not removed by address delete" + ++ # removing address from device in vrf should only remove route from vrf ++ # table even when the associated fib info only differs in table ID ++ echo " Identical FIB info with different table ID" ++ ++ $IP addr del dev dummy2 172.16.104.12/24 ++ $IP ro ls vrf red | grep -q 172.16.106.0/24 ++ log_test $? 1 "Route removed from VRF when source address deleted" ++ ++ $IP ro ls | grep -q 172.16.106.0/24 ++ log_test $? 0 "Route in default VRF not removed" ++ ++ $IP addr add dev dummy2 172.16.104.12/24 ++ $IP route add vrf red 172.16.106.0/24 dev lo src 172.16.104.12 ++ ++ $IP addr del dev dummy1 172.16.104.12/24 ++ $IP ro ls | grep -q 172.16.106.0/24 ++ log_test $? 1 "Route removed in default VRF when source address deleted" ++ ++ $IP ro ls vrf red | grep -q 172.16.106.0/24 ++ log_test $? 0 "Route in VRF is not removed by address delete" ++ + $IP li del dummy1 + $IP li del dummy2 + cleanup +-- +2.35.1 + diff --git a/queue-5.10/ipv4-fix-incorrect-route-flushing-when-table-id-0-is.patch b/queue-5.10/ipv4-fix-incorrect-route-flushing-when-table-id-0-is.patch new file mode 100644 index 00000000000..ad600668344 --- /dev/null +++ b/queue-5.10/ipv4-fix-incorrect-route-flushing-when-table-id-0-is.patch @@ -0,0 +1,140 @@ +From 3d40ad37942e8776ff5fd72855765e06c71f903c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 4 Dec 2022 09:50:45 +0200 +Subject: ipv4: Fix incorrect route flushing when table ID 0 is used + +From: Ido Schimmel + +[ Upstream commit c0d999348e01df03e0a7f550351f3907fabbf611 ] + +Cited commit added the table ID to the FIB info structure, but did not +properly initialize it when table ID 0 is used. This can lead to a route +in the default VRF with a preferred source address not being flushed +when the address is deleted. + +Consider the following example: + + # ip address add dev dummy1 192.0.2.1/28 + # ip address add dev dummy1 192.0.2.17/28 + # ip route add 198.51.100.0/24 via 192.0.2.2 src 192.0.2.17 metric 100 + # ip route add table 0 198.51.100.0/24 via 192.0.2.2 src 192.0.2.17 metric 200 + # ip route show 198.51.100.0/24 + 198.51.100.0/24 via 192.0.2.2 dev dummy1 src 192.0.2.17 metric 100 + 198.51.100.0/24 via 192.0.2.2 dev dummy1 src 192.0.2.17 metric 200 + +Both routes are installed in the default VRF, but they are using two +different FIB info structures. One with a metric of 100 and table ID of +254 (main) and one with a metric of 200 and table ID of 0. Therefore, +when the preferred source address is deleted from the default VRF, +the second route is not flushed: + + # ip address del dev dummy1 192.0.2.17/28 + # ip route show 198.51.100.0/24 + 198.51.100.0/24 via 192.0.2.2 dev dummy1 src 192.0.2.17 metric 200 + +Fix by storing a table ID of 254 instead of 0 in the route configuration +structure. + +Add a test case that fails before the fix: + + # ./fib_tests.sh -t ipv4_del_addr + + IPv4 delete address route tests + Regular FIB info + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + Identical FIB info with different table ID + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + Table ID 0 + TEST: Route removed in default VRF when source address deleted [FAIL] + + Tests passed: 8 + Tests failed: 1 + +And passes after: + + # ./fib_tests.sh -t ipv4_del_addr + + IPv4 delete address route tests + Regular FIB info + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + Identical FIB info with different table ID + TEST: Route removed from VRF when source address deleted [ OK ] + TEST: Route in default VRF not removed [ OK ] + TEST: Route removed in default VRF when source address deleted [ OK ] + TEST: Route in VRF is not removed by address delete [ OK ] + Table ID 0 + TEST: Route removed in default VRF when source address deleted [ OK ] + + Tests passed: 9 + Tests failed: 0 + +Fixes: 5a56a0b3a45d ("net: Don't delete routes in different VRFs") +Reported-by: Donald Sharp +Signed-off-by: Ido Schimmel +Reviewed-by: David Ahern +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/fib_frontend.c | 3 +++ + tools/testing/selftests/net/fib_tests.sh | 10 ++++++++++ + 2 files changed, 13 insertions(+) + +diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c +index af8a4255cf1b..5f786ef662ea 100644 +--- a/net/ipv4/fib_frontend.c ++++ b/net/ipv4/fib_frontend.c +@@ -830,6 +830,9 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb, + return -EINVAL; + } + ++ if (!cfg->fc_table) ++ cfg->fc_table = RT_TABLE_MAIN; ++ + return 0; + errout: + return err; +diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh +index a7b40dc56cae..0f3bf90e04d3 100755 +--- a/tools/testing/selftests/net/fib_tests.sh ++++ b/tools/testing/selftests/net/fib_tests.sh +@@ -1623,11 +1623,13 @@ ipv4_del_addr_test() + $IP addr add dev dummy1 172.16.104.1/24 + $IP addr add dev dummy1 172.16.104.11/24 + $IP addr add dev dummy1 172.16.104.12/24 ++ $IP addr add dev dummy1 172.16.104.13/24 + $IP addr add dev dummy2 172.16.104.1/24 + $IP addr add dev dummy2 172.16.104.11/24 + $IP addr add dev dummy2 172.16.104.12/24 + $IP route add 172.16.105.0/24 via 172.16.104.2 src 172.16.104.11 + $IP route add 172.16.106.0/24 dev lo src 172.16.104.12 ++ $IP route add table 0 172.16.107.0/24 via 172.16.104.2 src 172.16.104.13 + $IP route add vrf red 172.16.105.0/24 via 172.16.104.2 src 172.16.104.11 + $IP route add vrf red 172.16.106.0/24 dev lo src 172.16.104.12 + set +e +@@ -1673,6 +1675,14 @@ ipv4_del_addr_test() + $IP ro ls vrf red | grep -q 172.16.106.0/24 + log_test $? 0 "Route in VRF is not removed by address delete" + ++ # removing address from device in default vrf should remove route from ++ # the default vrf even when route was inserted with a table ID of 0. ++ echo " Table ID 0" ++ ++ $IP addr del dev dummy1 172.16.104.13/24 ++ $IP ro ls | grep -q 172.16.107.0/24 ++ log_test $? 1 "Route removed in default VRF when source address deleted" ++ + $IP li del dummy1 + $IP li del dummy2 + cleanup +-- +2.35.1 + diff --git a/queue-5.10/ipv6-avoid-use-after-free-in-ip6_fragment.patch b/queue-5.10/ipv6-avoid-use-after-free-in-ip6_fragment.patch new file mode 100644 index 00000000000..f0b2f67a901 --- /dev/null +++ b/queue-5.10/ipv6-avoid-use-after-free-in-ip6_fragment.patch @@ -0,0 +1,289 @@ +From fa72129ab99d97cb06b6676db003c726b2e02216 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Dec 2022 10:13:51 +0000 +Subject: ipv6: avoid use-after-free in ip6_fragment() + +From: Eric Dumazet + +[ Upstream commit 803e84867de59a1e5d126666d25eb4860cfd2ebe ] + +Blamed commit claimed rcu_read_lock() was held by ip6_fragment() callers. + +It seems to not be always true, at least for UDP stack. + +syzbot reported: + +BUG: KASAN: use-after-free in ip6_dst_idev include/net/ip6_fib.h:245 [inline] +BUG: KASAN: use-after-free in ip6_fragment+0x2724/0x2770 net/ipv6/ip6_output.c:951 +Read of size 8 at addr ffff88801d403e80 by task syz-executor.3/7618 + +CPU: 1 PID: 7618 Comm: syz-executor.3 Not tainted 6.1.0-rc6-syzkaller-00012-g4312098baf37 #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 +Call Trace: + + __dump_stack lib/dump_stack.c:88 [inline] + dump_stack_lvl+0xd1/0x138 lib/dump_stack.c:106 + print_address_description mm/kasan/report.c:284 [inline] + print_report+0x15e/0x45d mm/kasan/report.c:395 + kasan_report+0xbf/0x1f0 mm/kasan/report.c:495 + ip6_dst_idev include/net/ip6_fib.h:245 [inline] + ip6_fragment+0x2724/0x2770 net/ipv6/ip6_output.c:951 + __ip6_finish_output net/ipv6/ip6_output.c:193 [inline] + ip6_finish_output+0x9a3/0x1170 net/ipv6/ip6_output.c:206 + NF_HOOK_COND include/linux/netfilter.h:291 [inline] + ip6_output+0x1f1/0x540 net/ipv6/ip6_output.c:227 + dst_output include/net/dst.h:445 [inline] + ip6_local_out+0xb3/0x1a0 net/ipv6/output_core.c:161 + ip6_send_skb+0xbb/0x340 net/ipv6/ip6_output.c:1966 + udp_v6_send_skb+0x82a/0x18a0 net/ipv6/udp.c:1286 + udp_v6_push_pending_frames+0x140/0x200 net/ipv6/udp.c:1313 + udpv6_sendmsg+0x18da/0x2c80 net/ipv6/udp.c:1606 + inet6_sendmsg+0x9d/0xe0 net/ipv6/af_inet6.c:665 + sock_sendmsg_nosec net/socket.c:714 [inline] + sock_sendmsg+0xd3/0x120 net/socket.c:734 + sock_write_iter+0x295/0x3d0 net/socket.c:1108 + call_write_iter include/linux/fs.h:2191 [inline] + new_sync_write fs/read_write.c:491 [inline] + vfs_write+0x9ed/0xdd0 fs/read_write.c:584 + ksys_write+0x1ec/0x250 fs/read_write.c:637 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0xcd +RIP: 0033:0x7fde3588c0d9 +Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 +RSP: 002b:00007fde365b6168 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 +RAX: ffffffffffffffda RBX: 00007fde359ac050 RCX: 00007fde3588c0d9 +RDX: 000000000000ffdc RSI: 00000000200000c0 RDI: 000000000000000a +RBP: 00007fde358e7ae9 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 +R13: 00007fde35acfb1f R14: 00007fde365b6300 R15: 0000000000022000 + + +Allocated by task 7618: + kasan_save_stack+0x22/0x40 mm/kasan/common.c:45 + kasan_set_track+0x25/0x30 mm/kasan/common.c:52 + __kasan_slab_alloc+0x82/0x90 mm/kasan/common.c:325 + kasan_slab_alloc include/linux/kasan.h:201 [inline] + slab_post_alloc_hook mm/slab.h:737 [inline] + slab_alloc_node mm/slub.c:3398 [inline] + slab_alloc mm/slub.c:3406 [inline] + __kmem_cache_alloc_lru mm/slub.c:3413 [inline] + kmem_cache_alloc+0x2b4/0x3d0 mm/slub.c:3422 + dst_alloc+0x14a/0x1f0 net/core/dst.c:92 + ip6_dst_alloc+0x32/0xa0 net/ipv6/route.c:344 + ip6_rt_pcpu_alloc net/ipv6/route.c:1369 [inline] + rt6_make_pcpu_route net/ipv6/route.c:1417 [inline] + ip6_pol_route+0x901/0x1190 net/ipv6/route.c:2254 + pol_lookup_func include/net/ip6_fib.h:582 [inline] + fib6_rule_lookup+0x52e/0x6f0 net/ipv6/fib6_rules.c:121 + ip6_route_output_flags_noref+0x2e6/0x380 net/ipv6/route.c:2625 + ip6_route_output_flags+0x76/0x320 net/ipv6/route.c:2638 + ip6_route_output include/net/ip6_route.h:98 [inline] + ip6_dst_lookup_tail+0x5ab/0x1620 net/ipv6/ip6_output.c:1092 + ip6_dst_lookup_flow+0x90/0x1d0 net/ipv6/ip6_output.c:1222 + ip6_sk_dst_lookup_flow+0x553/0x980 net/ipv6/ip6_output.c:1260 + udpv6_sendmsg+0x151d/0x2c80 net/ipv6/udp.c:1554 + inet6_sendmsg+0x9d/0xe0 net/ipv6/af_inet6.c:665 + sock_sendmsg_nosec net/socket.c:714 [inline] + sock_sendmsg+0xd3/0x120 net/socket.c:734 + __sys_sendto+0x23a/0x340 net/socket.c:2117 + __do_sys_sendto net/socket.c:2129 [inline] + __se_sys_sendto net/socket.c:2125 [inline] + __x64_sys_sendto+0xe1/0x1b0 net/socket.c:2125 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0xcd + +Freed by task 7599: + kasan_save_stack+0x22/0x40 mm/kasan/common.c:45 + kasan_set_track+0x25/0x30 mm/kasan/common.c:52 + kasan_save_free_info+0x2e/0x40 mm/kasan/generic.c:511 + ____kasan_slab_free mm/kasan/common.c:236 [inline] + ____kasan_slab_free+0x160/0x1c0 mm/kasan/common.c:200 + kasan_slab_free include/linux/kasan.h:177 [inline] + slab_free_hook mm/slub.c:1724 [inline] + slab_free_freelist_hook+0x8b/0x1c0 mm/slub.c:1750 + slab_free mm/slub.c:3661 [inline] + kmem_cache_free+0xee/0x5c0 mm/slub.c:3683 + dst_destroy+0x2ea/0x400 net/core/dst.c:127 + rcu_do_batch kernel/rcu/tree.c:2250 [inline] + rcu_core+0x81f/0x1980 kernel/rcu/tree.c:2510 + __do_softirq+0x1fb/0xadc kernel/softirq.c:571 + +Last potentially related work creation: + kasan_save_stack+0x22/0x40 mm/kasan/common.c:45 + __kasan_record_aux_stack+0xbc/0xd0 mm/kasan/generic.c:481 + call_rcu+0x9d/0x820 kernel/rcu/tree.c:2798 + dst_release net/core/dst.c:177 [inline] + dst_release+0x7d/0xe0 net/core/dst.c:167 + refdst_drop include/net/dst.h:256 [inline] + skb_dst_drop include/net/dst.h:268 [inline] + skb_release_head_state+0x250/0x2a0 net/core/skbuff.c:838 + skb_release_all net/core/skbuff.c:852 [inline] + __kfree_skb net/core/skbuff.c:868 [inline] + kfree_skb_reason+0x151/0x4b0 net/core/skbuff.c:891 + kfree_skb_list_reason+0x4b/0x70 net/core/skbuff.c:901 + kfree_skb_list include/linux/skbuff.h:1227 [inline] + ip6_fragment+0x2026/0x2770 net/ipv6/ip6_output.c:949 + __ip6_finish_output net/ipv6/ip6_output.c:193 [inline] + ip6_finish_output+0x9a3/0x1170 net/ipv6/ip6_output.c:206 + NF_HOOK_COND include/linux/netfilter.h:291 [inline] + ip6_output+0x1f1/0x540 net/ipv6/ip6_output.c:227 + dst_output include/net/dst.h:445 [inline] + ip6_local_out+0xb3/0x1a0 net/ipv6/output_core.c:161 + ip6_send_skb+0xbb/0x340 net/ipv6/ip6_output.c:1966 + udp_v6_send_skb+0x82a/0x18a0 net/ipv6/udp.c:1286 + udp_v6_push_pending_frames+0x140/0x200 net/ipv6/udp.c:1313 + udpv6_sendmsg+0x18da/0x2c80 net/ipv6/udp.c:1606 + inet6_sendmsg+0x9d/0xe0 net/ipv6/af_inet6.c:665 + sock_sendmsg_nosec net/socket.c:714 [inline] + sock_sendmsg+0xd3/0x120 net/socket.c:734 + sock_write_iter+0x295/0x3d0 net/socket.c:1108 + call_write_iter include/linux/fs.h:2191 [inline] + new_sync_write fs/read_write.c:491 [inline] + vfs_write+0x9ed/0xdd0 fs/read_write.c:584 + ksys_write+0x1ec/0x250 fs/read_write.c:637 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0xcd + +Second to last potentially related work creation: + kasan_save_stack+0x22/0x40 mm/kasan/common.c:45 + __kasan_record_aux_stack+0xbc/0xd0 mm/kasan/generic.c:481 + call_rcu+0x9d/0x820 kernel/rcu/tree.c:2798 + dst_release net/core/dst.c:177 [inline] + dst_release+0x7d/0xe0 net/core/dst.c:167 + refdst_drop include/net/dst.h:256 [inline] + skb_dst_drop include/net/dst.h:268 [inline] + __dev_queue_xmit+0x1b9d/0x3ba0 net/core/dev.c:4211 + dev_queue_xmit include/linux/netdevice.h:3008 [inline] + neigh_resolve_output net/core/neighbour.c:1552 [inline] + neigh_resolve_output+0x51b/0x840 net/core/neighbour.c:1532 + neigh_output include/net/neighbour.h:546 [inline] + ip6_finish_output2+0x56c/0x1530 net/ipv6/ip6_output.c:134 + __ip6_finish_output net/ipv6/ip6_output.c:195 [inline] + ip6_finish_output+0x694/0x1170 net/ipv6/ip6_output.c:206 + NF_HOOK_COND include/linux/netfilter.h:291 [inline] + ip6_output+0x1f1/0x540 net/ipv6/ip6_output.c:227 + dst_output include/net/dst.h:445 [inline] + NF_HOOK include/linux/netfilter.h:302 [inline] + NF_HOOK include/linux/netfilter.h:296 [inline] + mld_sendpack+0xa09/0xe70 net/ipv6/mcast.c:1820 + mld_send_cr net/ipv6/mcast.c:2121 [inline] + mld_ifc_work+0x720/0xdc0 net/ipv6/mcast.c:2653 + process_one_work+0x9bf/0x1710 kernel/workqueue.c:2289 + worker_thread+0x669/0x1090 kernel/workqueue.c:2436 + kthread+0x2e8/0x3a0 kernel/kthread.c:376 + ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 + +The buggy address belongs to the object at ffff88801d403dc0 + which belongs to the cache ip6_dst_cache of size 240 +The buggy address is located 192 bytes inside of + 240-byte region [ffff88801d403dc0, ffff88801d403eb0) + +The buggy address belongs to the physical page: +page:ffffea00007500c0 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x1d403 +memcg:ffff888022f49c81 +flags: 0xfff00000000200(slab|node=0|zone=1|lastcpupid=0x7ff) +raw: 00fff00000000200 ffffea0001ef6580 dead000000000002 ffff88814addf640 +raw: 0000000000000000 00000000800c000c 00000001ffffffff ffff888022f49c81 +page dumped because: kasan: bad access detected +page_owner tracks the page as allocated +page last allocated via order 0, migratetype Unmovable, gfp_mask 0x112a20(GFP_ATOMIC|__GFP_NOWARN|__GFP_NORETRY|__GFP_HARDWALL), pid 3719, tgid 3719 (kworker/0:6), ts 136223432244, free_ts 136222971441 + prep_new_page mm/page_alloc.c:2539 [inline] + get_page_from_freelist+0x10b5/0x2d50 mm/page_alloc.c:4288 + __alloc_pages+0x1cb/0x5b0 mm/page_alloc.c:5555 + alloc_pages+0x1aa/0x270 mm/mempolicy.c:2285 + alloc_slab_page mm/slub.c:1794 [inline] + allocate_slab+0x213/0x300 mm/slub.c:1939 + new_slab mm/slub.c:1992 [inline] + ___slab_alloc+0xa91/0x1400 mm/slub.c:3180 + __slab_alloc.constprop.0+0x56/0xa0 mm/slub.c:3279 + slab_alloc_node mm/slub.c:3364 [inline] + slab_alloc mm/slub.c:3406 [inline] + __kmem_cache_alloc_lru mm/slub.c:3413 [inline] + kmem_cache_alloc+0x31a/0x3d0 mm/slub.c:3422 + dst_alloc+0x14a/0x1f0 net/core/dst.c:92 + ip6_dst_alloc+0x32/0xa0 net/ipv6/route.c:344 + icmp6_dst_alloc+0x71/0x680 net/ipv6/route.c:3261 + mld_sendpack+0x5de/0xe70 net/ipv6/mcast.c:1809 + mld_send_cr net/ipv6/mcast.c:2121 [inline] + mld_ifc_work+0x720/0xdc0 net/ipv6/mcast.c:2653 + process_one_work+0x9bf/0x1710 kernel/workqueue.c:2289 + worker_thread+0x669/0x1090 kernel/workqueue.c:2436 + kthread+0x2e8/0x3a0 kernel/kthread.c:376 + ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 +page last free stack trace: + reset_page_owner include/linux/page_owner.h:24 [inline] + free_pages_prepare mm/page_alloc.c:1459 [inline] + free_pcp_prepare+0x65c/0xd90 mm/page_alloc.c:1509 + free_unref_page_prepare mm/page_alloc.c:3387 [inline] + free_unref_page+0x1d/0x4d0 mm/page_alloc.c:3483 + __unfreeze_partials+0x17c/0x1a0 mm/slub.c:2586 + qlink_free mm/kasan/quarantine.c:168 [inline] + qlist_free_all+0x6a/0x170 mm/kasan/quarantine.c:187 + kasan_quarantine_reduce+0x184/0x210 mm/kasan/quarantine.c:294 + __kasan_slab_alloc+0x66/0x90 mm/kasan/common.c:302 + kasan_slab_alloc include/linux/kasan.h:201 [inline] + slab_post_alloc_hook mm/slab.h:737 [inline] + slab_alloc_node mm/slub.c:3398 [inline] + kmem_cache_alloc_node+0x304/0x410 mm/slub.c:3443 + __alloc_skb+0x214/0x300 net/core/skbuff.c:497 + alloc_skb include/linux/skbuff.h:1267 [inline] + netlink_alloc_large_skb net/netlink/af_netlink.c:1191 [inline] + netlink_sendmsg+0x9a6/0xe10 net/netlink/af_netlink.c:1896 + sock_sendmsg_nosec net/socket.c:714 [inline] + sock_sendmsg+0xd3/0x120 net/socket.c:734 + __sys_sendto+0x23a/0x340 net/socket.c:2117 + __do_sys_sendto net/socket.c:2129 [inline] + __se_sys_sendto net/socket.c:2125 [inline] + __x64_sys_sendto+0xe1/0x1b0 net/socket.c:2125 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0xcd + +Fixes: 1758fd4688eb ("ipv6: remove unnecessary dst_hold() in ip6_fragment()") +Reported-by: syzbot+8c0ac31aa9681abb9e2d@syzkaller.appspotmail.com +Signed-off-by: Eric Dumazet +Cc: Wei Wang +Cc: Martin KaFai Lau +Link: https://lore.kernel.org/r/20221206101351.2037285-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv6/ip6_output.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c +index fadad8e83521..e427f5040a08 100644 +--- a/net/ipv6/ip6_output.c ++++ b/net/ipv6/ip6_output.c +@@ -919,6 +919,9 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, + if (err < 0) + goto fail; + ++ /* We prevent @rt from being freed. */ ++ rcu_read_lock(); ++ + for (;;) { + /* Prepare header of the next frame, + * before previous one went down. */ +@@ -942,6 +945,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, + if (err == 0) { + IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), + IPSTATS_MIB_FRAGOKS); ++ rcu_read_unlock(); + return 0; + } + +@@ -949,6 +953,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, + + IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), + IPSTATS_MIB_FRAGFAILS); ++ rcu_read_unlock(); + return err; + + slow_path_clean: +-- +2.35.1 + diff --git a/queue-5.10/mac802154-fix-missing-init_list_head-in-ieee802154_i.patch b/queue-5.10/mac802154-fix-missing-init_list_head-in-ieee802154_i.patch new file mode 100644 index 00000000000..7da2f63bca3 --- /dev/null +++ b/queue-5.10/mac802154-fix-missing-init_list_head-in-ieee802154_i.patch @@ -0,0 +1,56 @@ +From eafd5635ddbe8acda05d8a2c239a289dcd91a0a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Nov 2022 09:17:05 +0000 +Subject: mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add() + +From: Wei Yongjun + +[ Upstream commit b3d72d3135d2ef68296c1ee174436efd65386f04 ] + +Kernel fault injection test reports null-ptr-deref as follows: + +BUG: kernel NULL pointer dereference, address: 0000000000000008 +RIP: 0010:cfg802154_netdev_notifier_call+0x120/0x310 include/linux/list.h:114 +Call Trace: + + raw_notifier_call_chain+0x6d/0xa0 kernel/notifier.c:87 + call_netdevice_notifiers_info+0x6e/0xc0 net/core/dev.c:1944 + unregister_netdevice_many_notify+0x60d/0xcb0 net/core/dev.c:1982 + unregister_netdevice_queue+0x154/0x1a0 net/core/dev.c:10879 + register_netdevice+0x9a8/0xb90 net/core/dev.c:10083 + ieee802154_if_add+0x6ed/0x7e0 net/mac802154/iface.c:659 + ieee802154_register_hw+0x29c/0x330 net/mac802154/main.c:229 + mcr20a_probe+0xaaa/0xcb1 drivers/net/ieee802154/mcr20a.c:1316 + +ieee802154_if_add() allocates wpan_dev as netdev's private data, but not +init the list in struct wpan_dev. cfg802154_netdev_notifier_call() manage +the list when device register/unregister, and may lead to null-ptr-deref. + +Use INIT_LIST_HEAD() on it to initialize it correctly. + +Fixes: fcf39e6e88e9 ("ieee802154: add wpan_dev_list") +Signed-off-by: Wei Yongjun +Acked-by: Alexander Aring + +Link: https://lore.kernel.org/r/20221130091705.1831140-1-weiyongjun@huaweicloud.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + net/mac802154/iface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c +index 1cf5ac09edcb..a08240fe68a7 100644 +--- a/net/mac802154/iface.c ++++ b/net/mac802154/iface.c +@@ -661,6 +661,7 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name, + sdata->dev = ndev; + sdata->wpan_dev.wpan_phy = local->hw.phy; + sdata->local = local; ++ INIT_LIST_HEAD(&sdata->wpan_dev.list); + + /* setup type-dependent data */ + ret = ieee802154_setup_sdata(sdata, type); +-- +2.35.1 + diff --git a/queue-5.10/macsec-add-missing-attribute-validation-for-offload.patch b/queue-5.10/macsec-add-missing-attribute-validation-for-offload.patch new file mode 100644 index 00000000000..403a3218bcd --- /dev/null +++ b/queue-5.10/macsec-add-missing-attribute-validation-for-offload.patch @@ -0,0 +1,38 @@ +From cb49ff010f831a241bab0ed11568d73a6b114447 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Dec 2022 12:16:18 +0200 +Subject: macsec: add missing attribute validation for offload + +From: Emeel Hakim + +[ Upstream commit 38099024e51ee37dee5f0f577ca37175c932e3f7 ] + +Add missing attribute validation for IFLA_MACSEC_OFFLOAD +to the netlink policy. + +Fixes: 791bb3fcafce ("net: macsec: add support for specifying offload upon link creation") +Signed-off-by: Emeel Hakim +Reviewed-by: Jiri Pirko +Reviewed-by: Sabrina Dubroca +Link: https://lore.kernel.org/r/20221207101618.989-1-ehakim@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/macsec.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c +index 3e564158c401..eb029456b594 100644 +--- a/drivers/net/macsec.c ++++ b/drivers/net/macsec.c +@@ -3680,6 +3680,7 @@ static const struct nla_policy macsec_rtnl_policy[IFLA_MACSEC_MAX + 1] = { + [IFLA_MACSEC_SCB] = { .type = NLA_U8 }, + [IFLA_MACSEC_REPLAY_PROTECT] = { .type = NLA_U8 }, + [IFLA_MACSEC_VALIDATION] = { .type = NLA_U8 }, ++ [IFLA_MACSEC_OFFLOAD] = { .type = NLA_U8 }, + }; + + static void macsec_free_netdev(struct net_device *dev) +-- +2.35.1 + diff --git a/queue-5.10/net-broadcom-add-ptp_1588_clock_optional-dependency-.patch b/queue-5.10/net-broadcom-add-ptp_1588_clock_optional-dependency-.patch new file mode 100644 index 00000000000..85dd491e263 --- /dev/null +++ b/queue-5.10/net-broadcom-add-ptp_1588_clock_optional-dependency-.patch @@ -0,0 +1,46 @@ +From 876f244f4ef1d9bd6121dee4e3066f26e179c573 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Nov 2022 19:50:03 +0800 +Subject: net: broadcom: Add PTP_1588_CLOCK_OPTIONAL dependency for BCMGENET + under ARCH_BCM2835 + +From: YueHaibing + +[ Upstream commit 421f8663b3a775c32f724f793264097c60028f2e ] + +commit 8d820bc9d12b ("net: broadcom: Fix BCMGENET Kconfig") fixes the build +that contain 99addbe31f55 ("net: broadcom: Select BROADCOM_PHY for BCMGENET") +and enable BCMGENET=y but PTP_1588_CLOCK_OPTIONAL=m, which otherwise +leads to a link failure. However this may trigger a runtime failure. + +Fix the original issue by propagating the PTP_1588_CLOCK_OPTIONAL dependency +of BROADCOM_PHY down to BCMGENET. + +Fixes: 8d820bc9d12b ("net: broadcom: Fix BCMGENET Kconfig") +Fixes: 99addbe31f55 ("net: broadcom: Select BROADCOM_PHY for BCMGENET") +Reported-by: Naresh Kamboju +Suggested-by: Arnd Bergmann +Signed-off-by: YueHaibing +Acked-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20221125115003.30308-1-yuehaibing@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/broadcom/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig +index 7b79528d6eed..06aaeaadf2e9 100644 +--- a/drivers/net/ethernet/broadcom/Kconfig ++++ b/drivers/net/ethernet/broadcom/Kconfig +@@ -63,6 +63,7 @@ config BCM63XX_ENET + config BCMGENET + tristate "Broadcom GENET internal MAC support" + depends on HAS_IOMEM ++ depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835 + select MII + select PHYLIB + select FIXED_PHY +-- +2.35.1 + diff --git a/queue-5.10/net-dsa-ksz-check-return-value.patch b/queue-5.10/net-dsa-ksz-check-return-value.patch new file mode 100644 index 00000000000..bac708b2d9d --- /dev/null +++ b/queue-5.10/net-dsa-ksz-check-return-value.patch @@ -0,0 +1,42 @@ +From 61e403da02f08b05d079416199b38d905bce427b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Dec 2022 17:00:30 +0300 +Subject: net: dsa: ksz: Check return value + +From: Artem Chernyshev + +[ Upstream commit 3d8fdcbf1f42e2bb9ae8b8c0b6f202278c788a22 ] + +Return NULL if we got unexpected value from skb_trim_rcsum() +in ksz_common_rcv() + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: bafe9ba7d908 ("net: dsa: ksz: Factor out common tag code") +Signed-off-by: Artem Chernyshev +Reviewed-by: Vladimir Oltean +Reviewed-by: Florian Fainelli +Link: https://lore.kernel.org/r/20221201140032.26746-1-artem.chernyshev@red-soft.ru +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/dsa/tag_ksz.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c +index 4820dbcedfa2..230ddf45dff0 100644 +--- a/net/dsa/tag_ksz.c ++++ b/net/dsa/tag_ksz.c +@@ -22,7 +22,8 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb, + if (!skb->dev) + return NULL; + +- pskb_trim_rcsum(skb, skb->len - len); ++ if (pskb_trim_rcsum(skb, skb->len - len)) ++ return NULL; + + skb->offload_fwd_mark = true; + +-- +2.35.1 + diff --git a/queue-5.10/net-dsa-sja1105-fix-memory-leak-in-sja1105_setup_dev.patch b/queue-5.10/net-dsa-sja1105-fix-memory-leak-in-sja1105_setup_dev.patch new file mode 100644 index 00000000000..b78577895d0 --- /dev/null +++ b/queue-5.10/net-dsa-sja1105-fix-memory-leak-in-sja1105_setup_dev.patch @@ -0,0 +1,39 @@ +From 130347bdbfba2891ac709315625fd01f38714605 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 5 Dec 2022 09:21:32 +0800 +Subject: net: dsa: sja1105: fix memory leak in sja1105_setup_devlink_regions() + +From: Zhengchao Shao + +[ Upstream commit 78a9ea43fc1a7c06a420b132d2d47cbf4344a5df ] + +When dsa_devlink_region_create failed in sja1105_setup_devlink_regions(), +priv->regions is not released. + +Fixes: bf425b82059e ("net: dsa: sja1105: expose static config as devlink region") +Signed-off-by: Zhengchao Shao +Reviewed-by: Vladimir Oltean +Reviewed-by: Florian Fainelli +Link: https://lore.kernel.org/r/20221205012132.2110979-1-shaozhengchao@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/sja1105/sja1105_devlink.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/dsa/sja1105/sja1105_devlink.c b/drivers/net/dsa/sja1105/sja1105_devlink.c +index ec2ac91abcfa..8e3d185c8460 100644 +--- a/drivers/net/dsa/sja1105/sja1105_devlink.c ++++ b/drivers/net/dsa/sja1105/sja1105_devlink.c +@@ -95,6 +95,8 @@ static int sja1105_setup_devlink_regions(struct dsa_switch *ds) + if (IS_ERR(region)) { + while (--i >= 0) + dsa_devlink_region_destroy(priv->regions[i]); ++ ++ kfree(priv->regions); + return PTR_ERR(region); + } + +-- +2.35.1 + diff --git a/queue-5.10/net-encx24j600-add-parentheses-to-fix-precedence.patch b/queue-5.10/net-encx24j600-add-parentheses-to-fix-precedence.patch new file mode 100644 index 00000000000..5fb60050dd2 --- /dev/null +++ b/queue-5.10/net-encx24j600-add-parentheses-to-fix-precedence.patch @@ -0,0 +1,50 @@ +From f192730e5eeeb236cb8defc1bae2b539f4b3b3df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Dec 2022 20:34:07 +0300 +Subject: net: encx24j600: Add parentheses to fix precedence + +From: Valentina Goncharenko + +[ Upstream commit 167b3f2dcc62c271f3555b33df17e361bb1fa0ee ] + +In functions regmap_encx24j600_phy_reg_read() and +regmap_encx24j600_phy_reg_write() in the conditions of the waiting +cycles for filling the variable 'ret' it is necessary to add parentheses +to prevent wrong assignment due to logical operations precedence. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: d70e53262f5c ("net: Microchip encx24j600 driver") +Signed-off-by: Valentina Goncharenko +Reviewed-by: Pavan Chebbi +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/microchip/encx24j600-regmap.c b/drivers/net/ethernet/microchip/encx24j600-regmap.c +index 81a8ccca7e5e..2e337c7a5773 100644 +--- a/drivers/net/ethernet/microchip/encx24j600-regmap.c ++++ b/drivers/net/ethernet/microchip/encx24j600-regmap.c +@@ -359,7 +359,7 @@ static int regmap_encx24j600_phy_reg_read(void *context, unsigned int reg, + goto err_out; + + usleep_range(26, 100); +- while ((ret = regmap_read(ctx->regmap, MISTAT, &mistat) != 0) && ++ while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) != 0) && + (mistat & BUSY)) + cpu_relax(); + +@@ -397,7 +397,7 @@ static int regmap_encx24j600_phy_reg_write(void *context, unsigned int reg, + goto err_out; + + usleep_range(26, 100); +- while ((ret = regmap_read(ctx->regmap, MISTAT, &mistat) != 0) && ++ while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) != 0) && + (mistat & BUSY)) + cpu_relax(); + +-- +2.35.1 + diff --git a/queue-5.10/net-encx24j600-fix-invalid-logic-in-reading-of-mista.patch b/queue-5.10/net-encx24j600-fix-invalid-logic-in-reading-of-mista.patch new file mode 100644 index 00000000000..a6fbc330d7e --- /dev/null +++ b/queue-5.10/net-encx24j600-fix-invalid-logic-in-reading-of-mista.patch @@ -0,0 +1,52 @@ +From c25f86d6b9dd7efd078f8071cb20c0148fefc8a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Dec 2022 20:34:08 +0300 +Subject: net: encx24j600: Fix invalid logic in reading of MISTAT register + +From: Valentina Goncharenko + +[ Upstream commit 25f427ac7b8d89b0259f86c0c6407b329df742b2 ] + +A loop for reading MISTAT register continues while regmap_read() fails +and (mistat & BUSY), but if regmap_read() fails a value of mistat is +undefined. + +The patch proposes to check for BUSY flag only when regmap_read() +succeed. Compile test only. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: d70e53262f5c ("net: Microchip encx24j600 driver") +Signed-off-by: Valentina Goncharenko +Reviewed-by: Pavan Chebbi +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/microchip/encx24j600-regmap.c b/drivers/net/ethernet/microchip/encx24j600-regmap.c +index 2e337c7a5773..5693784eec5b 100644 +--- a/drivers/net/ethernet/microchip/encx24j600-regmap.c ++++ b/drivers/net/ethernet/microchip/encx24j600-regmap.c +@@ -359,7 +359,7 @@ static int regmap_encx24j600_phy_reg_read(void *context, unsigned int reg, + goto err_out; + + usleep_range(26, 100); +- while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) != 0) && ++ while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) == 0) && + (mistat & BUSY)) + cpu_relax(); + +@@ -397,7 +397,7 @@ static int regmap_encx24j600_phy_reg_write(void *context, unsigned int reg, + goto err_out; + + usleep_range(26, 100); +- while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) != 0) && ++ while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) == 0) && + (mistat & BUSY)) + cpu_relax(); + +-- +2.35.1 + diff --git a/queue-5.10/net-hisilicon-fix-potential-use-after-free-in-hisi_f.patch b/queue-5.10/net-hisilicon-fix-potential-use-after-free-in-hisi_f.patch new file mode 100644 index 00000000000..ba1d26dc44b --- /dev/null +++ b/queue-5.10/net-hisilicon-fix-potential-use-after-free-in-hisi_f.patch @@ -0,0 +1,37 @@ +From d52c241ea0768e48a3ed3e7640745f989760099b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 17:42:39 +0800 +Subject: net: hisilicon: Fix potential use-after-free in hisi_femac_rx() + +From: Liu Jian + +[ Upstream commit 4640177049549de1a43e9bc49265f0cdfce08cfd ] + +The skb is delivered to napi_gro_receive() which may free it, after +calling this, dereferencing skb may trigger use-after-free. + +Fixes: 542ae60af24f ("net: hisilicon: Add Fast Ethernet MAC driver") +Signed-off-by: Liu Jian +Link: https://lore.kernel.org/r/20221203094240.1240211-1-liujian56@huawei.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c +index 57c3bc4f7089..c16dfd869363 100644 +--- a/drivers/net/ethernet/hisilicon/hisi_femac.c ++++ b/drivers/net/ethernet/hisilicon/hisi_femac.c +@@ -283,7 +283,7 @@ static int hisi_femac_rx(struct net_device *dev, int limit) + skb->protocol = eth_type_trans(skb, dev); + napi_gro_receive(&priv->napi, skb); + dev->stats.rx_packets++; +- dev->stats.rx_bytes += skb->len; ++ dev->stats.rx_bytes += len; + next: + pos = (pos + 1) % rxq->num; + if (rx_pkts_num >= limit) +-- +2.35.1 + diff --git a/queue-5.10/net-hisilicon-fix-potential-use-after-free-in-hix5hd.patch b/queue-5.10/net-hisilicon-fix-potential-use-after-free-in-hix5hd.patch new file mode 100644 index 00000000000..df32e19511c --- /dev/null +++ b/queue-5.10/net-hisilicon-fix-potential-use-after-free-in-hix5hd.patch @@ -0,0 +1,37 @@ +From 8c186af35cc5c152e14a954fd870e455a0592846 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 17:42:40 +0800 +Subject: net: hisilicon: Fix potential use-after-free in hix5hd2_rx() + +From: Liu Jian + +[ Upstream commit 433c07a13f59856e4585e89e86b7d4cc59348fab ] + +The skb is delivered to napi_gro_receive() which may free it, after +calling this, dereferencing skb may trigger use-after-free. + +Fixes: 57c5bc9ad7d7 ("net: hisilicon: add hix5hd2 mac driver") +Signed-off-by: Liu Jian +Link: https://lore.kernel.org/r/20221203094240.1240211-2-liujian56@huawei.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +index 8b2bf85039f1..43f3146caf07 100644 +--- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c ++++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +@@ -550,7 +550,7 @@ static int hix5hd2_rx(struct net_device *dev, int limit) + skb->protocol = eth_type_trans(skb, dev); + napi_gro_receive(&priv->napi, skb); + dev->stats.rx_packets++; +- dev->stats.rx_bytes += skb->len; ++ dev->stats.rx_bytes += len; + next: + pos = dma_ring_incr(pos, RX_DESC_NUM); + } +-- +2.35.1 + diff --git a/queue-5.10/net-mvneta-fix-an-out-of-bounds-check.patch b/queue-5.10/net-mvneta-fix-an-out-of-bounds-check.patch new file mode 100644 index 00000000000..fd7883364b0 --- /dev/null +++ b/queue-5.10/net-mvneta-fix-an-out-of-bounds-check.patch @@ -0,0 +1,55 @@ +From 5b44ddf2be66ce3a7c6e1ae13d199db136a751cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Dec 2022 10:06:31 +0300 +Subject: net: mvneta: Fix an out of bounds check + +From: Dan Carpenter + +[ Upstream commit cdd97383e19d4afe29adc3376025a15ae3bab3a3 ] + +In an earlier commit, I added a bounds check to prevent an out of bounds +read and a WARN(). On further discussion and consideration that check +was probably too aggressive. Instead of returning -EINVAL, a better fix +would be to just prevent the out of bounds read but continue the process. + +Background: The value of "pp->rxq_def" is a number between 0-7 by default, +or even higher depending on the value of "rxq_number", which is a module +parameter. If the value is more than the number of available CPUs then +it will trigger the WARN() in cpu_max_bits_warn(). + +Fixes: e8b4fc13900b ("net: mvneta: Prevent out of bounds read in mvneta_config_rss()") +Signed-off-by: Dan Carpenter +Reviewed-by: Leon Romanovsky +Link: https://lore.kernel.org/r/Y5A7d1E5ccwHTYPf@kadam +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/mvneta.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c +index 6bfa0ac27be3..f5567d485e91 100644 +--- a/drivers/net/ethernet/marvell/mvneta.c ++++ b/drivers/net/ethernet/marvell/mvneta.c +@@ -4140,7 +4140,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp) + /* Use the cpu associated to the rxq when it is online, in all + * the other cases, use the cpu 0 which can't be offline. + */ +- if (cpu_online(pp->rxq_def)) ++ if (pp->rxq_def < nr_cpu_ids && cpu_online(pp->rxq_def)) + elected_cpu = pp->rxq_def; + + max_cpu = num_present_cpus(); +@@ -4767,9 +4767,6 @@ static int mvneta_config_rss(struct mvneta_port *pp) + napi_disable(&pp->napi); + } + +- if (pp->indir[0] >= nr_cpu_ids) +- return -EINVAL; +- + pp->rxq_def = pp->indir[0]; + + /* Update unicast mapping */ +-- +2.35.1 + diff --git a/queue-5.10/net-mvneta-prevent-out-of-bounds-read-in-mvneta_conf.patch b/queue-5.10/net-mvneta-prevent-out-of-bounds-read-in-mvneta_conf.patch new file mode 100644 index 00000000000..1bee5804754 --- /dev/null +++ b/queue-5.10/net-mvneta-prevent-out-of-bounds-read-in-mvneta_conf.patch @@ -0,0 +1,41 @@ +From ba6af0c8c19e4a7f3e206da0c385855cc18a698d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 2 Dec 2022 12:58:26 +0300 +Subject: net: mvneta: Prevent out of bounds read in mvneta_config_rss() + +From: Dan Carpenter + +[ Upstream commit e8b4fc13900b8e8be48debffd0dfd391772501f7 ] + +The pp->indir[0] value comes from the user. It is passed to: + + if (cpu_online(pp->rxq_def)) + +inside the mvneta_percpu_elect() function. It needs bounds checkeding +to ensure that it is not beyond the end of the cpu bitmap. + +Fixes: cad5d847a093 ("net: mvneta: Fix the CPU choice in mvneta_percpu_elect") +Signed-off-by: Dan Carpenter +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/mvneta.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c +index 74e266c0b8e1..6bfa0ac27be3 100644 +--- a/drivers/net/ethernet/marvell/mvneta.c ++++ b/drivers/net/ethernet/marvell/mvneta.c +@@ -4767,6 +4767,9 @@ static int mvneta_config_rss(struct mvneta_port *pp) + napi_disable(&pp->napi); + } + ++ if (pp->indir[0] >= nr_cpu_ids) ++ return -EINVAL; ++ + pp->rxq_def = pp->indir[0]; + + /* Update unicast mapping */ +-- +2.35.1 + diff --git a/queue-5.10/net-plip-don-t-call-kfree_skb-dev_kfree_skb-under-sp.patch b/queue-5.10/net-plip-don-t-call-kfree_skb-dev_kfree_skb-under-sp.patch new file mode 100644 index 00000000000..93a93af6dd4 --- /dev/null +++ b/queue-5.10/net-plip-don-t-call-kfree_skb-dev_kfree_skb-under-sp.patch @@ -0,0 +1,46 @@ +From 720e82aa730e33d2f3b3db1fdd26d9d67931b083 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Dec 2022 09:53:10 +0800 +Subject: net: plip: don't call kfree_skb/dev_kfree_skb() under spin_lock_irq() + +From: Yang Yingliang + +[ Upstream commit 7d8c19bfc8ff3f78e5337107ca9246327fcb6b45 ] + +It is not allowed to call kfree_skb() or consume_skb() from +hardware interrupt context or with interrupts being disabled. +So replace kfree_skb/dev_kfree_skb() with dev_kfree_skb_irq() +and dev_consume_skb_irq() under spin_lock_irq(). + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Yang Yingliang +Reviewed-by: Jiri Pirko +Link: https://lore.kernel.org/r/20221207015310.2984909-1-yangyingliang@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/plip/plip.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c +index 5a0e5a8a8917..22f7db87ed21 100644 +--- a/drivers/net/plip/plip.c ++++ b/drivers/net/plip/plip.c +@@ -444,12 +444,12 @@ plip_bh_timeout_error(struct net_device *dev, struct net_local *nl, + } + rcv->state = PLIP_PK_DONE; + if (rcv->skb) { +- kfree_skb(rcv->skb); ++ dev_kfree_skb_irq(rcv->skb); + rcv->skb = NULL; + } + snd->state = PLIP_PK_DONE; + if (snd->skb) { +- dev_kfree_skb(snd->skb); ++ dev_consume_skb_irq(snd->skb); + snd->skb = NULL; + } + spin_unlock_irq(&nl->lock); +-- +2.35.1 + diff --git a/queue-5.10/net-stmmac-fix-snps-axi-config-node-property-parsing.patch b/queue-5.10/net-stmmac-fix-snps-axi-config-node-property-parsing.patch new file mode 100644 index 00000000000..e2d00c610be --- /dev/null +++ b/queue-5.10/net-stmmac-fix-snps-axi-config-node-property-parsing.patch @@ -0,0 +1,45 @@ +From 66955e5b5ba83095955e251d24058f4e4435e13d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 00:17:39 +0800 +Subject: net: stmmac: fix "snps,axi-config" node property parsing + +From: Jisheng Zhang + +[ Upstream commit 61d4f140943c47c1386ed89f7260e00418dfad9d ] + +In dt-binding snps,dwmac.yaml, some properties under "snps,axi-config" +node are named without "axi_" prefix, but the driver expects the +prefix. Since the dt-binding has been there for a long time, we'd +better make driver match the binding for compatibility. + +Fixes: afea03656add ("stmmac: rework DMA bus setting and introduce new platform AXI structure") +Signed-off-by: Jisheng Zhang +Link: https://lore.kernel.org/r/20221202161739.2203-1-jszhang@kernel.org +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +index f70d8d1ce329..1ed74cfb61fc 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +@@ -108,10 +108,10 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev) + + axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en"); + axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm"); +- axi->axi_kbbe = of_property_read_bool(np, "snps,axi_kbbe"); +- axi->axi_fb = of_property_read_bool(np, "snps,axi_fb"); +- axi->axi_mb = of_property_read_bool(np, "snps,axi_mb"); +- axi->axi_rb = of_property_read_bool(np, "snps,axi_rb"); ++ axi->axi_kbbe = of_property_read_bool(np, "snps,kbbe"); ++ axi->axi_fb = of_property_read_bool(np, "snps,fb"); ++ axi->axi_mb = of_property_read_bool(np, "snps,mb"); ++ axi->axi_rb = of_property_read_bool(np, "snps,rb"); + + if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt)) + axi->axi_wr_osr_lmt = 1; +-- +2.35.1 + diff --git a/queue-5.10/net-thunderx-fix-missing-destroy_workqueue-of-nicvf_.patch b/queue-5.10/net-thunderx-fix-missing-destroy_workqueue-of-nicvf_.patch new file mode 100644 index 00000000000..964520c5317 --- /dev/null +++ b/queue-5.10/net-thunderx-fix-missing-destroy_workqueue-of-nicvf_.patch @@ -0,0 +1,47 @@ +From 6dc817c564521f5cfbaedc0a538bf980aee6bb46 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 09:41:25 +0000 +Subject: net: thunderx: Fix missing destroy_workqueue of nicvf_rx_mode_wq + +From: Yongqiang Liu + +[ Upstream commit 42330a32933fb42180c52022804dcf09f47a2f99 ] + +The nicvf_probe() won't destroy workqueue when register_netdev() +failed. Add destroy_workqueue err handle case to fix this issue. + +Fixes: 2ecbe4f4a027 ("net: thunderx: replace global nicvf_rx_mode_wq work queue for all VFs to private for each of them.") +Signed-off-by: Yongqiang Liu +Reviewed-by: Pavan Chebbi +Link: https://lore.kernel.org/r/20221203094125.602812-1-liuyongqiang13@huawei.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c +index c00f1a7ffc15..488da767cfdf 100644 +--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c ++++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c +@@ -2258,7 +2258,7 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + err = register_netdev(netdev); + if (err) { + dev_err(dev, "Failed to register netdevice\n"); +- goto err_unregister_interrupts; ++ goto err_destroy_workqueue; + } + + nic->msg_enable = debug; +@@ -2267,6 +2267,8 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + + return 0; + ++err_destroy_workqueue: ++ destroy_workqueue(nic->nicvf_rx_mode_wq); + err_unregister_interrupts: + nicvf_unregister_interrupts(nic); + err_free_netdev: +-- +2.35.1 + diff --git a/queue-5.10/netfilter-ctnetlink-fix-compilation-warning-after-da.patch b/queue-5.10/netfilter-ctnetlink-fix-compilation-warning-after-da.patch new file mode 100644 index 00000000000..17341dc5ff2 --- /dev/null +++ b/queue-5.10/netfilter-ctnetlink-fix-compilation-warning-after-da.patch @@ -0,0 +1,95 @@ +From a014c7d002fa908b4e011f4678861e631fc13d71 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Nov 2022 10:58:53 +0100 +Subject: netfilter: ctnetlink: fix compilation warning after data race fixes + in ct mark + +From: Pablo Neira Ayuso + +[ Upstream commit 1feeae071507ad65cf9f462a1bdd543a4bf89e71 ] + +All warnings (new ones prefixed by >>): + + net/netfilter/nf_conntrack_netlink.c: In function '__ctnetlink_glue_build': +>> net/netfilter/nf_conntrack_netlink.c:2674:13: warning: unused variable 'mark' [-Wunused-variable] + 2674 | u32 mark; + | ^~~~ + +Fixes: 52d1aa8b8249 ("netfilter: conntrack: Fix data-races around ct mark") +Reported-by: kernel test robot +Tested-by: Ivan Babrou +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_conntrack_netlink.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c +index c402283e7545..2efdc50f978b 100644 +--- a/net/netfilter/nf_conntrack_netlink.c ++++ b/net/netfilter/nf_conntrack_netlink.c +@@ -317,8 +317,13 @@ ctnetlink_dump_timestamp(struct sk_buff *skb, const struct nf_conn *ct) + } + + #ifdef CONFIG_NF_CONNTRACK_MARK +-static int ctnetlink_dump_mark(struct sk_buff *skb, u32 mark) ++static int ctnetlink_dump_mark(struct sk_buff *skb, const struct nf_conn *ct) + { ++ u32 mark = READ_ONCE(ct->mark); ++ ++ if (!mark) ++ return 0; ++ + if (nla_put_be32(skb, CTA_MARK, htonl(mark))) + goto nla_put_failure; + return 0; +@@ -532,7 +537,7 @@ static int ctnetlink_dump_extinfo(struct sk_buff *skb, + static int ctnetlink_dump_info(struct sk_buff *skb, struct nf_conn *ct) + { + if (ctnetlink_dump_status(skb, ct) < 0 || +- ctnetlink_dump_mark(skb, READ_ONCE(ct->mark)) < 0 || ++ ctnetlink_dump_mark(skb, ct) < 0 || + ctnetlink_dump_secctx(skb, ct) < 0 || + ctnetlink_dump_id(skb, ct) < 0 || + ctnetlink_dump_use(skb, ct) < 0 || +@@ -711,7 +716,6 @@ ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) + struct sk_buff *skb; + unsigned int type; + unsigned int flags = 0, group; +- u32 mark; + int err; + + if (events & (1 << IPCT_DESTROY)) { +@@ -812,9 +816,8 @@ ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) + } + + #ifdef CONFIG_NF_CONNTRACK_MARK +- mark = READ_ONCE(ct->mark); +- if ((events & (1 << IPCT_MARK) || mark) && +- ctnetlink_dump_mark(skb, mark) < 0) ++ if (events & (1 << IPCT_MARK) && ++ ctnetlink_dump_mark(skb, ct) < 0) + goto nla_put_failure; + #endif + nlmsg_end(skb, nlh); +@@ -2671,7 +2674,6 @@ static int __ctnetlink_glue_build(struct sk_buff *skb, struct nf_conn *ct) + { + const struct nf_conntrack_zone *zone; + struct nlattr *nest_parms; +- u32 mark; + + zone = nf_ct_zone(ct); + +@@ -2729,8 +2731,7 @@ static int __ctnetlink_glue_build(struct sk_buff *skb, struct nf_conn *ct) + goto nla_put_failure; + + #ifdef CONFIG_NF_CONNTRACK_MARK +- mark = READ_ONCE(ct->mark); +- if (mark && ctnetlink_dump_mark(skb, mark) < 0) ++ if (ctnetlink_dump_mark(skb, ct) < 0) + goto nla_put_failure; + #endif + if (ctnetlink_dump_labels(skb, ct) < 0) +-- +2.35.1 + diff --git a/queue-5.10/netfilter-nft_set_pipapo-actually-validate-intervals.patch b/queue-5.10/netfilter-nft_set_pipapo-actually-validate-intervals.patch new file mode 100644 index 00000000000..317eb7c9c16 --- /dev/null +++ b/queue-5.10/netfilter-nft_set_pipapo-actually-validate-intervals.patch @@ -0,0 +1,53 @@ +From ef215446f32eec420ed0d041949054126b37c95d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Nov 2022 13:04:37 +0100 +Subject: netfilter: nft_set_pipapo: Actually validate intervals in fields + after the first one + +From: Stefano Brivio + +[ Upstream commit 97d4d394b58777f7056ebba8ffdb4002d0563259 ] + +Embarrassingly, nft_pipapo_insert() checked for interval validity in +the first field only. + +The start_p and end_p pointers were reset to key data from the first +field at every iteration of the loop which was supposed to go over +the set fields. + +Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") +Reported-by: Pablo Neira Ayuso +Signed-off-by: Stefano Brivio +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nft_set_pipapo.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c +index 949da87dbb06..30cf0673d6c1 100644 +--- a/net/netfilter/nft_set_pipapo.c ++++ b/net/netfilter/nft_set_pipapo.c +@@ -1162,6 +1162,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set, + struct nft_pipapo_match *m = priv->clone; + u8 genmask = nft_genmask_next(net); + struct nft_pipapo_field *f; ++ const u8 *start_p, *end_p; + int i, bsize_max, err = 0; + + if (nft_set_ext_exists(ext, NFT_SET_EXT_KEY_END)) +@@ -1202,9 +1203,9 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set, + } + + /* Validate */ ++ start_p = start; ++ end_p = end; + nft_pipapo_for_each_field(f, i, m) { +- const u8 *start_p = start, *end_p = end; +- + if (f->rules >= (unsigned long)NFT_PIPAPO_RULE0_MAX) + return -ENOSPC; + +-- +2.35.1 + diff --git a/queue-5.10/nfc-nci-bounds-check-struct-nfc_target-arrays.patch b/queue-5.10/nfc-nci-bounds-check-struct-nfc_target-arrays.patch new file mode 100644 index 00000000000..594812f1491 --- /dev/null +++ b/queue-5.10/nfc-nci-bounds-check-struct-nfc_target-arrays.patch @@ -0,0 +1,62 @@ +From 70a5c738bd9bdfd944ae79a4c5a993a726a24417 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 2 Dec 2022 13:44:14 -0800 +Subject: NFC: nci: Bounds check struct nfc_target arrays + +From: Kees Cook + +[ Upstream commit e329e71013c9b5a4535b099208493c7826ee4a64 ] + +While running under CONFIG_FORTIFY_SOURCE=y, syzkaller reported: + + memcpy: detected field-spanning write (size 129) of single field "target->sensf_res" at net/nfc/nci/ntf.c:260 (size 18) + +This appears to be a legitimate lack of bounds checking in +nci_add_new_protocol(). Add the missing checks. + +Reported-by: syzbot+210e196cef4711b65139@syzkaller.appspotmail.com +Link: https://lore.kernel.org/lkml/0000000000001c590f05ee7b3ff4@google.com +Fixes: 019c4fbaa790 ("NFC: Add NCI multiple targets support") +Signed-off-by: Kees Cook +Reviewed-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20221202214410.never.693-kees@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/nfc/nci/ntf.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c +index 33e1170817f0..f8b20cddd5c9 100644 +--- a/net/nfc/nci/ntf.c ++++ b/net/nfc/nci/ntf.c +@@ -218,6 +218,8 @@ static int nci_add_new_protocol(struct nci_dev *ndev, + target->sens_res = nfca_poll->sens_res; + target->sel_res = nfca_poll->sel_res; + target->nfcid1_len = nfca_poll->nfcid1_len; ++ if (target->nfcid1_len > ARRAY_SIZE(target->nfcid1)) ++ return -EPROTO; + if (target->nfcid1_len > 0) { + memcpy(target->nfcid1, nfca_poll->nfcid1, + target->nfcid1_len); +@@ -226,6 +228,8 @@ static int nci_add_new_protocol(struct nci_dev *ndev, + nfcb_poll = (struct rf_tech_specific_params_nfcb_poll *)params; + + target->sensb_res_len = nfcb_poll->sensb_res_len; ++ if (target->sensb_res_len > ARRAY_SIZE(target->sensb_res)) ++ return -EPROTO; + if (target->sensb_res_len > 0) { + memcpy(target->sensb_res, nfcb_poll->sensb_res, + target->sensb_res_len); +@@ -234,6 +238,8 @@ static int nci_add_new_protocol(struct nci_dev *ndev, + nfcf_poll = (struct rf_tech_specific_params_nfcf_poll *)params; + + target->sensf_res_len = nfcf_poll->sensf_res_len; ++ if (target->sensf_res_len > ARRAY_SIZE(target->sensf_res)) ++ return -EPROTO; + if (target->sensf_res_len > 0) { + memcpy(target->sensf_res, nfcf_poll->sensf_res, + target->sensf_res_len); +-- +2.35.1 + diff --git a/queue-5.10/nvme-initialize-core-quirks-before-calling-nvme_init.patch b/queue-5.10/nvme-initialize-core-quirks-before-calling-nvme_init.patch new file mode 100644 index 00000000000..7e8ea3f5164 --- /dev/null +++ b/queue-5.10/nvme-initialize-core-quirks-before-calling-nvme_init.patch @@ -0,0 +1,57 @@ +From 351671ce31f9fd689bd19e6ead0ee0f327ad83f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Dec 2022 13:52:34 +0100 +Subject: nvme initialize core quirks before calling nvme_init_subsystem + +From: Pankaj Raghav + +[ Upstream commit 6f2d71524bcfdeb1fcbd22a4a92a5b7b161ab224 ] + +A device might have a core quirk for NVME_QUIRK_IGNORE_DEV_SUBNQN +(such as Samsung X5) but it would still give a: + + "missing or invalid SUBNQN field" + +warning as core quirks are filled after calling nvme_init_subnqn. Fill +ctrl->quirks from struct core_quirks before calling nvme_init_subsystem +to fix this. + +Tested on a Samsung X5. + +Fixes: ab9e00cc72fa ("nvme: track subsystems") +Signed-off-by: Pankaj Raghav +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/core.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c +index d9c78fe85cb3..e162f1dfbafe 100644 +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -3092,10 +3092,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) + if (!ctrl->identified) { + int i; + +- ret = nvme_init_subsystem(ctrl, id); +- if (ret) +- goto out_free; +- + /* + * Check for quirks. Quirk can depend on firmware version, + * so, in principle, the set of quirks present can change +@@ -3108,6 +3104,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) + if (quirk_matches(id, &core_quirks[i])) + ctrl->quirks |= core_quirks[i].quirks; + } ++ ++ ret = nvme_init_subsystem(ctrl, id); ++ if (ret) ++ goto out_free; + } + memcpy(ctrl->subsys->firmware_rev, id->fr, + sizeof(ctrl->subsys->firmware_rev)); +-- +2.35.1 + diff --git a/queue-5.10/selftests-rtnetlink-correct-xfrm-policy-rule-in-kci_.patch b/queue-5.10/selftests-rtnetlink-correct-xfrm-policy-rule-in-kci_.patch new file mode 100644 index 00000000000..8333cb8807a --- /dev/null +++ b/queue-5.10/selftests-rtnetlink-correct-xfrm-policy-rule-in-kci_.patch @@ -0,0 +1,41 @@ +From a5b9dae64313680e047f1ec489156d7af4496a01 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Dec 2022 16:22:46 +0800 +Subject: selftests: rtnetlink: correct xfrm policy rule in + kci_test_ipsec_offload + +From: Zhengchao Shao + +[ Upstream commit 85a0506c073332a3057f5a9635fa0d4db5a8e03b ] + +When testing in kci_test_ipsec_offload, srcip is configured as $dstip, +it should add xfrm policy rule in instead of out. +The test result of this patch is as follows: +PASS: ipsec_offload + +Fixes: 2766a11161cc ("selftests: rtnetlink: add ipsec offload API test") +Signed-off-by: Zhengchao Shao +Acked-by: Hangbin Liu +Link: https://lore.kernel.org/r/20221201082246.14131-1-shaozhengchao@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/net/rtnetlink.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh +index c9ce3dfa42ee..c3a905923ef2 100755 +--- a/tools/testing/selftests/net/rtnetlink.sh ++++ b/tools/testing/selftests/net/rtnetlink.sh +@@ -782,7 +782,7 @@ kci_test_ipsec_offload() + tmpl proto esp src $srcip dst $dstip spi 9 \ + mode transport reqid 42 + check_err $? +- ip x p add dir out src $dstip/24 dst $srcip/24 \ ++ ip x p add dir in src $dstip/24 dst $srcip/24 \ + tmpl proto esp src $dstip dst $srcip spi 9 \ + mode transport reqid 42 + check_err $? +-- +2.35.1 + diff --git a/queue-5.10/series b/queue-5.10/series index cf0d1aed6b7..69251c539c1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -60,3 +60,46 @@ can-af_can-fix-null-pointer-dereference-in-can_rcv_filter.patch rtc-cmos-disable-irq-around-direct-invocation-of-cmo.patch rtc-mc146818-lib-fix-locking-in-mc146818_set_time.patch rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_.patch +netfilter-nft_set_pipapo-actually-validate-intervals.patch +ieee802154-cc2520-fix-error-return-code-in-cc2520_hw.patch +ca8210-fix-crash-by-zero-initializing-data.patch +netfilter-ctnetlink-fix-compilation-warning-after-da.patch +drm-bridge-ti-sn65dsi86-fix-output-polarity-setting-.patch +gpio-amd8111-fix-pci-device-reference-count-leak.patch +e1000e-fix-tx-dispatch-condition.patch +igb-allocate-msi-x-vector-when-testing.patch +net-broadcom-add-ptp_1588_clock_optional-dependency-.patch +drm-bridge-dw_hdmi-fix-preference-of-rgb-modes-over-.patch +af_unix-get-user_ns-from-in_skb-in-unix_diag_get_exa.patch +vmxnet3-correctly-report-encapsulated-lro-packet.patch +bluetooth-6lowpan-add-missing-hci_dev_put-in-get_l2c.patch +bluetooth-fix-not-cleanup-led-when-bt_init-fails.patch +net-dsa-ksz-check-return-value.patch +selftests-rtnetlink-correct-xfrm-policy-rule-in-kci_.patch +mac802154-fix-missing-init_list_head-in-ieee802154_i.patch +net-encx24j600-add-parentheses-to-fix-precedence.patch +net-encx24j600-fix-invalid-logic-in-reading-of-mista.patch +xen-netfront-fix-null-sring-after-live-migration.patch +net-mvneta-prevent-out-of-bounds-read-in-mvneta_conf.patch +i40e-fix-not-setting-default-xps_cpus-after-reset.patch +i40e-fix-for-vf-mac-address-0.patch +i40e-disallow-ip4-and-ip6-l4_4_bytes.patch +nfc-nci-bounds-check-struct-nfc_target-arrays.patch +nvme-initialize-core-quirks-before-calling-nvme_init.patch +net-stmmac-fix-snps-axi-config-node-property-parsing.patch +ip_gre-do-not-report-erspan-version-on-gre-interface.patch +net-thunderx-fix-missing-destroy_workqueue-of-nicvf_.patch +net-hisilicon-fix-potential-use-after-free-in-hisi_f.patch +net-hisilicon-fix-potential-use-after-free-in-hix5hd.patch +tipc-fix-potential-oob-in-tipc_link_proto_rcv.patch +ipv4-fix-incorrect-route-flushing-when-source-addres.patch +ipv4-fix-incorrect-route-flushing-when-table-id-0-is.patch +net-dsa-sja1105-fix-memory-leak-in-sja1105_setup_dev.patch +tipc-call-tipc_lxc_xmit-without-holding-node_read_lo.patch +ethernet-aeroflex-fix-potential-skb-leak-in-greth_in.patch +xen-netback-fix-build-warning.patch +net-plip-don-t-call-kfree_skb-dev_kfree_skb-under-sp.patch +ipv6-avoid-use-after-free-in-ip6_fragment.patch +net-mvneta-fix-an-out-of-bounds-check.patch +macsec-add-missing-attribute-validation-for-offload.patch +can-esd_usb-allow-rec-and-tec-to-return-to-zero.patch diff --git a/queue-5.10/tipc-call-tipc_lxc_xmit-without-holding-node_read_lo.patch b/queue-5.10/tipc-call-tipc_lxc_xmit-without-holding-node_read_lo.patch new file mode 100644 index 00000000000..8108873d60e --- /dev/null +++ b/queue-5.10/tipc-call-tipc_lxc_xmit-without-holding-node_read_lo.patch @@ -0,0 +1,145 @@ +From 05d5e28f6b9e9085a64ca1d8e160eceee8350b16 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 18:37:21 -0500 +Subject: tipc: call tipc_lxc_xmit without holding node_read_lock + +From: Xin Long + +[ Upstream commit 88956177db179e4eba7cd590971961857d1565b8 ] + +When sending packets between nodes in netns, it calls tipc_lxc_xmit() for +peer node to receive the packets where tipc_sk_mcast_rcv()/tipc_sk_rcv() +might be called, and it's pretty much like in tipc_rcv(). + +Currently the local 'node rw lock' is held during calling tipc_lxc_xmit() +to protect the peer_net not being freed by another thread. However, when +receiving these packets, tipc_node_add_conn() might be called where the +peer 'node rw lock' is acquired. Then a dead lock warning is triggered by +lockdep detector, although it is not a real dead lock: + + WARNING: possible recursive locking detected + -------------------------------------------- + conn_server/1086 is trying to acquire lock: + ffff8880065cb020 (&n->lock#2){++--}-{2:2}, \ + at: tipc_node_add_conn.cold.76+0xaa/0x211 [tipc] + + but task is already holding lock: + ffff8880065cd020 (&n->lock#2){++--}-{2:2}, \ + at: tipc_node_xmit+0x285/0xb30 [tipc] + + other info that might help us debug this: + Possible unsafe locking scenario: + + CPU0 + ---- + lock(&n->lock#2); + lock(&n->lock#2); + + *** DEADLOCK *** + + May be due to missing lock nesting notation + + 4 locks held by conn_server/1086: + #0: ffff8880036d1e40 (sk_lock-AF_TIPC){+.+.}-{0:0}, \ + at: tipc_accept+0x9c0/0x10b0 [tipc] + #1: ffff8880036d5f80 (sk_lock-AF_TIPC/1){+.+.}-{0:0}, \ + at: tipc_accept+0x363/0x10b0 [tipc] + #2: ffff8880065cd020 (&n->lock#2){++--}-{2:2}, \ + at: tipc_node_xmit+0x285/0xb30 [tipc] + #3: ffff888012e13370 (slock-AF_TIPC){+...}-{2:2}, \ + at: tipc_sk_rcv+0x2da/0x1b40 [tipc] + + Call Trace: + + dump_stack_lvl+0x44/0x5b + __lock_acquire.cold.77+0x1f2/0x3d7 + lock_acquire+0x1d2/0x610 + _raw_write_lock_bh+0x38/0x80 + tipc_node_add_conn.cold.76+0xaa/0x211 [tipc] + tipc_sk_finish_conn+0x21e/0x640 [tipc] + tipc_sk_filter_rcv+0x147b/0x3030 [tipc] + tipc_sk_rcv+0xbb4/0x1b40 [tipc] + tipc_lxc_xmit+0x225/0x26b [tipc] + tipc_node_xmit.cold.82+0x4a/0x102 [tipc] + __tipc_sendstream+0x879/0xff0 [tipc] + tipc_accept+0x966/0x10b0 [tipc] + do_accept+0x37d/0x590 + +This patch avoids this warning by not holding the 'node rw lock' before +calling tipc_lxc_xmit(). As to protect the 'peer_net', rcu_read_lock() +should be enough, as in cleanup_net() when freeing the netns, it calls +synchronize_rcu() before the free is continued. + +Also since tipc_lxc_xmit() is like the RX path in tipc_rcv(), it makes +sense to call it under rcu_read_lock(). Note that the right lock order +must be: + + rcu_read_lock(); + tipc_node_read_lock(n); + tipc_node_read_unlock(n); + tipc_lxc_xmit(); + rcu_read_unlock(); + +instead of: + + tipc_node_read_lock(n); + rcu_read_lock(); + tipc_node_read_unlock(n); + tipc_lxc_xmit(); + rcu_read_unlock(); + +and we have to call tipc_node_read_lock/unlock() twice in +tipc_node_xmit(). + +Fixes: f73b12812a3d ("tipc: improve throughput between nodes in netns") +Reported-by: Shuang Li +Signed-off-by: Xin Long +Link: https://lore.kernel.org/r/5bdd1f8fee9db695cfff4528a48c9b9d0523fb00.1670110641.git.lucien.xin@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/tipc/node.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/net/tipc/node.c b/net/tipc/node.c +index 60059827563a..7589f2ac6fd0 100644 +--- a/net/tipc/node.c ++++ b/net/tipc/node.c +@@ -1660,6 +1660,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, + struct tipc_node *n; + struct sk_buff_head xmitq; + bool node_up = false; ++ struct net *peer_net; + int bearer_id; + int rc; + +@@ -1676,18 +1677,23 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, + return -EHOSTUNREACH; + } + ++ rcu_read_lock(); + tipc_node_read_lock(n); + node_up = node_is_up(n); +- if (node_up && n->peer_net && check_net(n->peer_net)) { ++ peer_net = n->peer_net; ++ tipc_node_read_unlock(n); ++ if (node_up && peer_net && check_net(peer_net)) { + /* xmit inner linux container */ +- tipc_lxc_xmit(n->peer_net, list); ++ tipc_lxc_xmit(peer_net, list); + if (likely(skb_queue_empty(list))) { +- tipc_node_read_unlock(n); ++ rcu_read_unlock(); + tipc_node_put(n); + return 0; + } + } ++ rcu_read_unlock(); + ++ tipc_node_read_lock(n); + bearer_id = n->active_links[selector & 1]; + if (unlikely(bearer_id == INVALID_BEARER_ID)) { + tipc_node_read_unlock(n); +-- +2.35.1 + diff --git a/queue-5.10/tipc-fix-potential-oob-in-tipc_link_proto_rcv.patch b/queue-5.10/tipc-fix-potential-oob-in-tipc_link_proto_rcv.patch new file mode 100644 index 00000000000..3b9a5fc35e5 --- /dev/null +++ b/queue-5.10/tipc-fix-potential-oob-in-tipc_link_proto_rcv.patch @@ -0,0 +1,39 @@ +From a4c9cfe3e7e9eb4a6a69926901b4f4dcf25e6ccc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Dec 2022 17:46:35 +0800 +Subject: tipc: Fix potential OOB in tipc_link_proto_rcv() + +From: YueHaibing + +[ Upstream commit 743117a997bbd4840e827295c07e59bcd7f7caa3 ] + +Fix the potential risk of OOB if skb_linearize() fails in +tipc_link_proto_rcv(). + +Fixes: 5cbb28a4bf65 ("tipc: linearize arriving NAME_DISTR and LINK_PROTO buffers") +Signed-off-by: YueHaibing +Link: https://lore.kernel.org/r/20221203094635.29024-1-yuehaibing@huawei.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/tipc/link.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/tipc/link.c b/net/tipc/link.c +index 064fdb8e50e1..c1e56d1f21b3 100644 +--- a/net/tipc/link.c ++++ b/net/tipc/link.c +@@ -2188,7 +2188,9 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb, + if (tipc_own_addr(l->net) > msg_prevnode(hdr)) + l->net_plane = msg_net_plane(hdr); + +- skb_linearize(skb); ++ if (skb_linearize(skb)) ++ goto exit; ++ + hdr = buf_msg(skb); + data = msg_data(hdr); + +-- +2.35.1 + diff --git a/queue-5.10/vmxnet3-correctly-report-encapsulated-lro-packet.patch b/queue-5.10/vmxnet3-correctly-report-encapsulated-lro-packet.patch new file mode 100644 index 00000000000..513afd2d3a8 --- /dev/null +++ b/queue-5.10/vmxnet3-correctly-report-encapsulated-lro-packet.patch @@ -0,0 +1,86 @@ +From 78fe6c2e4dfeecda1613fbf1eb1b1dc54f5a1704 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Nov 2022 00:21:46 -0800 +Subject: vmxnet3: correctly report encapsulated LRO packet + +From: Ronak Doshi + +[ Upstream commit 40b8c2a1af03ba3e8da55a4490d646bfa845e71a ] + +Commit dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload +support") added support for encapsulation offload. However, the +pathc did not report correctly the encapsulated packet which is +LRO'ed by the hypervisor. + +This patch fixes this issue by using correct callback for the LRO'ed +encapsulated packet. + +Fixes: dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support") +Signed-off-by: Ronak Doshi +Acked-by: Guolin Yang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/vmxnet3/vmxnet3_drv.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c +index 6678a734cc4d..43a4bcdd92c1 100644 +--- a/drivers/net/vmxnet3/vmxnet3_drv.c ++++ b/drivers/net/vmxnet3/vmxnet3_drv.c +@@ -1356,6 +1356,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, + }; + u32 num_pkts = 0; + bool skip_page_frags = false; ++ bool encap_lro = false; + struct Vmxnet3_RxCompDesc *rcd; + struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx; + u16 segCnt = 0, mss = 0; +@@ -1496,13 +1497,18 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, + if (VMXNET3_VERSION_GE_2(adapter) && + rcd->type == VMXNET3_CDTYPE_RXCOMP_LRO) { + struct Vmxnet3_RxCompDescExt *rcdlro; ++ union Vmxnet3_GenericDesc *gdesc; ++ + rcdlro = (struct Vmxnet3_RxCompDescExt *)rcd; ++ gdesc = (union Vmxnet3_GenericDesc *)rcd; + + segCnt = rcdlro->segCnt; + WARN_ON_ONCE(segCnt == 0); + mss = rcdlro->mss; + if (unlikely(segCnt <= 1)) + segCnt = 0; ++ encap_lro = (le32_to_cpu(gdesc->dword[0]) & ++ (1UL << VMXNET3_RCD_HDR_INNER_SHIFT)); + } else { + segCnt = 0; + } +@@ -1570,7 +1576,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, + vmxnet3_rx_csum(adapter, skb, + (union Vmxnet3_GenericDesc *)rcd); + skb->protocol = eth_type_trans(skb, adapter->netdev); +- if (!rcd->tcp || ++ if ((!rcd->tcp && !encap_lro) || + !(adapter->netdev->features & NETIF_F_LRO)) + goto not_lro; + +@@ -1579,7 +1585,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, + SKB_GSO_TCPV4 : SKB_GSO_TCPV6; + skb_shinfo(skb)->gso_size = mss; + skb_shinfo(skb)->gso_segs = segCnt; +- } else if (segCnt != 0 || skb->len > mtu) { ++ } else if ((segCnt != 0 || skb->len > mtu) && !encap_lro) { + u32 hlen; + + hlen = vmxnet3_get_hdr_len(adapter, skb, +@@ -1608,6 +1614,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, + napi_gro_receive(&rq->napi, skb); + + ctx->skb = NULL; ++ encap_lro = false; + num_pkts++; + } + +-- +2.35.1 + diff --git a/queue-5.10/xen-netback-fix-build-warning.patch b/queue-5.10/xen-netback-fix-build-warning.patch new file mode 100644 index 00000000000..14b56b4dd80 --- /dev/null +++ b/queue-5.10/xen-netback-fix-build-warning.patch @@ -0,0 +1,40 @@ +From baaabcd5a26723ca65434effdb7e3dfac71fa49d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Dec 2022 08:19:38 +0100 +Subject: xen/netback: fix build warning + +From: Juergen Gross + +[ Upstream commit 7dfa764e0223a324366a2a1fc056d4d9d4e95491 ] + +Commit ad7f402ae4f4 ("xen/netback: Ensure protocol headers don't fall in +the non-linear area") introduced a (valid) build warning. There have +even been reports of this problem breaking networking of Xen guests. + +Fixes: ad7f402ae4f4 ("xen/netback: Ensure protocol headers don't fall in the non-linear area") +Signed-off-by: Juergen Gross +Reviewed-by: Jan Beulich +Reviewed-by: Ross Lagerwall +Tested-by: Jason Andryuk +Signed-off-by: Juergen Gross +Signed-off-by: Sasha Levin +--- + drivers/net/xen-netback/netback.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c +index fed0f7458e18..f9373a88cf37 100644 +--- a/drivers/net/xen-netback/netback.c ++++ b/drivers/net/xen-netback/netback.c +@@ -530,7 +530,7 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, + const bool sharedslot = nr_frags && + frag_get_pending_idx(&shinfo->frags[0]) == + copy_pending_idx(skb, copy_count(skb) - 1); +- int i, err; ++ int i, err = 0; + + for (i = 0; i < copy_count(skb); i++) { + int newerr; +-- +2.35.1 + diff --git a/queue-5.10/xen-netfront-fix-null-sring-after-live-migration.patch b/queue-5.10/xen-netfront-fix-null-sring-after-live-migration.patch new file mode 100644 index 00000000000..9d26a9e17b3 --- /dev/null +++ b/queue-5.10/xen-netfront-fix-null-sring-after-live-migration.patch @@ -0,0 +1,86 @@ +From 11ca5e9c6c338d27ef52615114de75aebe8a9a5b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 2 Dec 2022 08:52:48 +0000 +Subject: xen-netfront: Fix NULL sring after live migration + +From: Lin Liu + +[ Upstream commit d50b7914fae04d840ce36491d22133070b18cca9 ] + +A NAPI is setup for each network sring to poll data to kernel +The sring with source host is destroyed before live migration and +new sring with target host is setup after live migration. +The NAPI for the old sring is not deleted until setup new sring +with target host after migration. With busy_poll/busy_read enabled, +the NAPI can be polled before got deleted when resume VM. + +BUG: unable to handle kernel NULL pointer dereference at +0000000000000008 +IP: xennet_poll+0xae/0xd20 +PGD 0 P4D 0 +Oops: 0000 [#1] SMP PTI +Call Trace: + finish_task_switch+0x71/0x230 + timerqueue_del+0x1d/0x40 + hrtimer_try_to_cancel+0xb5/0x110 + xennet_alloc_rx_buffers+0x2a0/0x2a0 + napi_busy_loop+0xdb/0x270 + sock_poll+0x87/0x90 + do_sys_poll+0x26f/0x580 + tracing_map_insert+0x1d4/0x2f0 + event_hist_trigger+0x14a/0x260 + + finish_task_switch+0x71/0x230 + __schedule+0x256/0x890 + recalc_sigpending+0x1b/0x50 + xen_sched_clock+0x15/0x20 + __rb_reserve_next+0x12d/0x140 + ring_buffer_lock_reserve+0x123/0x3d0 + event_triggers_call+0x87/0xb0 + trace_event_buffer_commit+0x1c4/0x210 + xen_clocksource_get_cycles+0x15/0x20 + ktime_get_ts64+0x51/0xf0 + SyS_ppoll+0x160/0x1a0 + SyS_ppoll+0x160/0x1a0 + do_syscall_64+0x73/0x130 + entry_SYSCALL_64_after_hwframe+0x41/0xa6 +... +RIP: xennet_poll+0xae/0xd20 RSP: ffffb4f041933900 +CR2: 0000000000000008 +---[ end trace f8601785b354351c ]--- + +xen frontend should remove the NAPIs for the old srings before live +migration as the bond srings are destroyed + +There is a tiny window between the srings are set to NULL and +the NAPIs are disabled, It is safe as the NAPI threads are still +frozen at that time + +Signed-off-by: Lin Liu +Fixes: 4ec2411980d0 ([NET]: Do not check netif_running() and carrier state in ->poll()) +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/xen-netfront.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c +index 569f3c8e7b75..3d149890fa36 100644 +--- a/drivers/net/xen-netfront.c ++++ b/drivers/net/xen-netfront.c +@@ -1868,6 +1868,12 @@ static int netfront_resume(struct xenbus_device *dev) + netif_tx_unlock_bh(info->netdev); + + xennet_disconnect_backend(info); ++ ++ rtnl_lock(); ++ if (info->queues) ++ xennet_destroy_queues(info); ++ rtnl_unlock(); ++ + return 0; + } + +-- +2.35.1 +