edgeos: Bump kernels
BUG=b/230667631
TEST=cusky
RELEASE_NOTE=none
Change-Id: I03681db55185013ca523ca7e96032f84498e9279
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/32240
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.110-r20.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.110-r20.ebuild
deleted file mode 120000
index c3c9c2b..0000000
--- a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.110-r20.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-lakitu-kernel-5_10-5.10.110.ebuild
\ No newline at end of file
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.112-r21.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.112-r21.ebuild
new file mode 120000
index 0000000..53cd9e7
--- /dev/null
+++ b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.112-r21.ebuild
@@ -0,0 +1 @@
+lakitu-kernel-5_10-5.10.112.ebuild
\ No newline at end of file
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.110.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.112.ebuild
similarity index 93%
rename from project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.110.ebuild
rename to project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.112.ebuild
index 38c122d..a6810f8 100644
--- a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.110.ebuild
+++ b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.112.ebuild
@@ -13,8 +13,8 @@
EAPI=6
-CROS_WORKON_COMMIT="26d5ace8828fa092c2f1062b0276b5267a1138bc"
-CROS_WORKON_TREE="4898953860202e450d857aa214626787908105cb"
+CROS_WORKON_COMMIT="fc7b2db8a80f6d354fd7dcdefabbee10c8ce5576"
+CROS_WORKON_TREE="42774f8eb7e3a7730fa97f26fe9c2bab426a1b61"
CROS_WORKON_REPO="https://cos.googlesource.com"
CROS_WORKON_PROJECT="third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.10"
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0003-net-sched-cls_u32-fix-netns-refcount-changes-in-u32_.patch b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0003-net-sched-cls_u32-fix-netns-refcount-changes-in-u32_.patch
new file mode 100644
index 0000000..d27ce77
--- /dev/null
+++ b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0003-net-sched-cls_u32-fix-netns-refcount-changes-in-u32_.patch
@@ -0,0 +1,142 @@
+From 43ce33a68e2bcc431097e1075aad5393d0bf53ba Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 13 Apr 2022 10:35:41 -0700
+Subject: [PATCH] net/sched: cls_u32: fix netns refcount changes in
+ u32_change()
+
+commit 3db09e762dc79584a69c10d74a6b98f89a9979f8 upstream.
+
+We are now able to detect extra put_net() at the moment
+they happen, instead of much later in correct code paths.
+
+u32_init_knode() / tcf_exts_init() populates the ->exts.net
+pointer, but as mentioned in tcf_exts_init(),
+the refcount on netns has not been elevated yet.
+
+The refcount is taken only once tcf_exts_get_net()
+is called.
+
+So the two u32_destroy_key() calls from u32_change()
+are attempting to release an invalid reference on the netns.
+
+syzbot report:
+
+refcount_t: decrement hit 0; leaking memory.
+WARNING: CPU: 0 PID: 21708 at lib/refcount.c:31 refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31
+Modules linked in:
+CPU: 0 PID: 21708 Comm: syz-executor.5 Not tainted 5.18.0-rc2-next-20220412-syzkaller #0
+Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
+RIP: 0010:refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31
+Code: 1d 14 b6 b2 09 31 ff 89 de e8 6d e9 89 fd 84 db 75 e0 e8 84 e5 89 fd 48 c7 c7 40 aa 26 8a c6 05 f4 b5 b2 09 01 e8 e5 81 2e 05 <0f> 0b eb c4 e8 68 e5 89 fd 0f b6 1d e3 b5 b2 09 31 ff 89 de e8 38
+RSP: 0018:ffffc900051af1b0 EFLAGS: 00010286
+RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
+RDX: 0000000000040000 RSI: ffffffff8160a0c8 RDI: fffff52000a35e28
+RBP: 0000000000000004 R08: 0000000000000000 R09: 0000000000000000
+R10: ffffffff81604a9e R11: 0000000000000000 R12: 1ffff92000a35e3b
+R13: 00000000ffffffef R14: ffff8880211a0194 R15: ffff8880577d0a00
+FS: 00007f25d183e700(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000
+CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+CR2: 00007f19c859c028 CR3: 0000000051009000 CR4: 00000000003506f0
+DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
+DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
+Call Trace:
+ <TASK>
+ __refcount_dec include/linux/refcount.h:344 [inline]
+ refcount_dec include/linux/refcount.h:359 [inline]
+ ref_tracker_free+0x535/0x6b0 lib/ref_tracker.c:118
+ netns_tracker_free include/net/net_namespace.h:327 [inline]
+ put_net_track include/net/net_namespace.h:341 [inline]
+ tcf_exts_put_net include/net/pkt_cls.h:255 [inline]
+ u32_destroy_key.isra.0+0xa7/0x2b0 net/sched/cls_u32.c:394
+ u32_change+0xe01/0x3140 net/sched/cls_u32.c:909
+ tc_new_tfilter+0x98d/0x2200 net/sched/cls_api.c:2148
+ rtnetlink_rcv_msg+0x80d/0xb80 net/core/rtnetlink.c:6016
+ netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2495
+ netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline]
+ netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345
+ netlink_sendmsg+0x904/0xe00 net/netlink/af_netlink.c:1921
+ sock_sendmsg_nosec net/socket.c:705 [inline]
+ sock_sendmsg+0xcf/0x120 net/socket.c:725
+ ____sys_sendmsg+0x6e2/0x800 net/socket.c:2413
+ ___sys_sendmsg+0xf3/0x170 net/socket.c:2467
+ __sys_sendmsg+0xe5/0x1b0 net/socket.c:2496
+ do_syscall_x64 arch/x86/entry/common.c:50 [inline]
+ do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
+ entry_SYSCALL_64_after_hwframe+0x44/0xae
+RIP: 0033:0x7f25d0689049
+Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 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 b8 ff ff ff f7 d8 64 89 01 48
+RSP: 002b:00007f25d183e168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
+RAX: ffffffffffffffda RBX: 00007f25d079c030 RCX: 00007f25d0689049
+RDX: 0000000000000000 RSI: 0000000020000340 RDI: 0000000000000005
+RBP: 00007f25d06e308d R08: 0000000000000000 R09: 0000000000000000
+R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
+R13: 00007ffd0b752e3f R14: 00007f25d183e300 R15: 0000000000022000
+ </TASK>
+
+Fixes: 35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Cc: Cong Wang <xiyou.wangcong@gmail.com>
+Cc: Jiri Pirko <jiri@resnulli.us>
+Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/cls_u32.c | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
+index 54209a18d7fe..b61db335c49d 100644
+--- a/net/sched/cls_u32.c
++++ b/net/sched/cls_u32.c
+@@ -386,14 +386,19 @@ static int u32_init(struct tcf_proto *tp)
+ return 0;
+ }
+
+-static int u32_destroy_key(struct tc_u_knode *n, bool free_pf)
++static void __u32_destroy_key(struct tc_u_knode *n)
+ {
+ struct tc_u_hnode *ht = rtnl_dereference(n->ht_down);
+
+ tcf_exts_destroy(&n->exts);
+- tcf_exts_put_net(&n->exts);
+ if (ht && --ht->refcnt == 0)
+ kfree(ht);
++ kfree(n);
++}
++
++static void u32_destroy_key(struct tc_u_knode *n, bool free_pf)
++{
++ tcf_exts_put_net(&n->exts);
+ #ifdef CONFIG_CLS_U32_PERF
+ if (free_pf)
+ free_percpu(n->pf);
+@@ -402,8 +407,7 @@ static int u32_destroy_key(struct tc_u_knode *n, bool free_pf)
+ if (free_pf)
+ free_percpu(n->pcpu_success);
+ #endif
+- kfree(n);
+- return 0;
++ __u32_destroy_key(n);
+ }
+
+ /* u32_delete_key_rcu should be called when free'ing a copied
+@@ -898,13 +902,13 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
+ tca[TCA_RATE], ovr, extack);
+
+ if (err) {
+- u32_destroy_key(new, false);
++ __u32_destroy_key(new);
+ return err;
+ }
+
+ err = u32_replace_hw_knode(tp, new, flags, extack);
+ if (err) {
+- u32_destroy_key(new, false);
++ __u32_destroy_key(new);
+ return err;
+ }
+
+--
+2.36.0.464.gb9c8b46e94-goog
+
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0004-io_uring-fix-race-between-timeout-flush-and-removal.patch b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0004-io_uring-fix-race-between-timeout-flush-and-removal.patch
new file mode 100644
index 0000000..df69329
--- /dev/null
+++ b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0004-io_uring-fix-race-between-timeout-flush-and-removal.patch
@@ -0,0 +1,83 @@
+From 2827328e646d0c2d3db1bfcad4b5f5016ce0d643 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Fri, 8 Apr 2022 11:08:58 -0600
+Subject: [PATCH] io_uring: fix race between timeout flush and removal
+
+commit e677edbcabee849bfdd43f1602bccbecf736a646 upstream.
+
+io_flush_timeouts() assumes the timeout isn't in progress of triggering
+or being removed/canceled, so it unconditionally removes it from the
+timeout list and attempts to cancel it.
+
+Leave it on the list and let the normal timeout cancelation take care
+of it.
+
+Cc: stable@vger.kernel.org # 5.5+
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/io_uring.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/fs/io_uring.c b/fs/io_uring.c
+index 3580fa2dabc8..ab9290ab4cae 100644
+--- a/fs/io_uring.c
++++ b/fs/io_uring.c
+@@ -1556,6 +1556,7 @@ static void __io_queue_deferred(struct io_ring_ctx *ctx)
+
+ static void io_flush_timeouts(struct io_ring_ctx *ctx)
+ {
++ struct io_kiocb *req, *tmp;
+ u32 seq;
+
+ if (list_empty(&ctx->timeout_list))
+@@ -1563,10 +1564,8 @@ static void io_flush_timeouts(struct io_ring_ctx *ctx)
+
+ seq = ctx->cached_cq_tail - atomic_read(&ctx->cq_timeouts);
+
+- do {
++ list_for_each_entry_safe(req, tmp, &ctx->timeout_list, timeout.list) {
+ u32 events_needed, events_got;
+- struct io_kiocb *req = list_first_entry(&ctx->timeout_list,
+- struct io_kiocb, timeout.list);
+
+ if (io_is_timeout_noseq(req))
+ break;
+@@ -1583,9 +1582,8 @@ static void io_flush_timeouts(struct io_ring_ctx *ctx)
+ if (events_got < events_needed)
+ break;
+
+- list_del_init(&req->timeout.list);
+ io_kill_timeout(req, 0);
+- } while (!list_empty(&ctx->timeout_list));
++ }
+
+ ctx->cq_last_tm_flush = seq;
+ }
+@@ -5639,6 +5637,7 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
+ else
+ data->mode = HRTIMER_MODE_REL;
+
++ INIT_LIST_HEAD(&req->timeout.list);
+ hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode);
+ return 0;
+ }
+@@ -6282,12 +6281,12 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer)
+ if (!list_empty(&req->link_list)) {
+ prev = list_entry(req->link_list.prev, struct io_kiocb,
+ link_list);
+- if (refcount_inc_not_zero(&prev->refs))
+- list_del_init(&req->link_list);
+- else
++ list_del_init(&req->link_list);
++ if (!refcount_inc_not_zero(&prev->refs))
+ prev = NULL;
+ }
+
++ list_del(&req->timeout.list);
+ spin_unlock_irqrestore(&ctx->completion_lock, flags);
+
+ if (prev) {
+--
+2.36.0.464.gb9c8b46e94-goog
+
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.109-r21.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.109-r22.ebuild
similarity index 100%
rename from project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.109-r21.ebuild
rename to project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.109-r22.ebuild
