From: Sasha Levin Date: Thu, 16 Sep 2021 13:55:59 +0000 (-0400) Subject: Drop bpf-fix-off-by-one-in-tail-call-count-limiting.patch X-Git-Tag: v5.10.67~4^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=153d84a240cc34c0785ad64051c187ac8ecc9222;p=thirdparty%2Fkernel%2Fstable-queue.git Drop bpf-fix-off-by-one-in-tail-call-count-limiting.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-4.14/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index f722fc79f54..00000000000 --- a/queue-4.14/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6fbf4b748ba3a0b1d8cd685849142b3f0129d71c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index e7211b0fa27c..1d19f4fa7f44 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -1095,7 +1095,7 @@ static unsigned int ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index f4f88785412..8e700f82908 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -157,7 +157,6 @@ staging-ks7010-fix-the-initialization-of-the-sleep_s.patch ata-sata_dwc_460ex-no-need-to-call-phy_exit-befre-ph.patch bluetooth-skip-invalid-hci_sync_conn_complete_evt.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch media-v4l2-dv-timings.c-fix-wrong-condition-in-two-f.patch arm64-dts-qcom-sdm660-use-reg-value-for-memory-node.patch net-ethernet-stmmac-do-not-use-unreachable-in-ipq806.patch diff --git a/queue-4.19/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-4.19/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index 15f3742a047..00000000000 --- a/queue-4.19/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc0fccc371e8e360c158d0a4704fce6c3c17f7b4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index 341402bc1202..5a417309cc2d 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -1200,7 +1200,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack) - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index ba6fc6e22d1..182cbfea58a 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -203,7 +203,6 @@ ata-sata_dwc_460ex-no-need-to-call-phy_exit-befre-ph.patch bluetooth-skip-invalid-hci_sync_conn_complete_evt.patch bonding-3ad-fix-the-concurrency-between-__bond_relea.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch media-imx258-rectify-mismatch-of-vts-value.patch media-imx258-limit-the-max-analogue-gain-to-480.patch media-v4l2-dv-timings.c-fix-wrong-condition-in-two-f.patch diff --git a/queue-4.9/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-4.9/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index 9f10e21b642..00000000000 --- a/queue-4.9/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4495f456a144ddcfb6f12733cd8a988b4b205808 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index df2ebce927ec..3e1d03512a4f 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -774,7 +774,7 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn) - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index ee1e7f4ea95..e3c07fbce0c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -130,7 +130,6 @@ staging-ks7010-fix-the-initialization-of-the-sleep_s.patch ata-sata_dwc_460ex-no-need-to-call-phy_exit-befre-ph.patch bluetooth-skip-invalid-hci_sync_conn_complete_evt.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch net-ethernet-stmmac-do-not-use-unreachable-in-ipq806.patch bluetooth-avoid-circular-locks-in-sco_sock_connect.patch gpu-drm-amd-amdgpu-amdgpu_i2c-fix-possible-uninitial.patch diff --git a/queue-5.10/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-5.10/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index 65a42bd5d08..00000000000 --- a/queue-5.10/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e84c9e1279b07ca2df96b82511f9c16f4a070ec8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index d12efb2550d3..f25b23fddbee 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -1565,7 +1565,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack) - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-5.10/series b/queue-5.10/series index b20a6a41e4c..226dd7ffb06 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -176,7 +176,6 @@ bonding-3ad-fix-the-concurrency-between-__bond_relea.patch arm-dts-at91-use-the-right-property-for-shutdown-con.patch arm64-tegra-fix-tegra194-pcie-ep-compatible-string.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch asoc-intel-update-sof_pcm512x-quirks.patch media-imx258-rectify-mismatch-of-vts-value.patch media-imx258-limit-the-max-analogue-gain-to-480.patch diff --git a/queue-5.13/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-5.13/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index 7c5b9e4ffc2..00000000000 --- a/queue-5.13/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a22ec2334086a40ae1f77e38fa3d6831a78cc578 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index b1a5fc04492b..fe807b203a6f 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -1562,7 +1562,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-5.13/series b/queue-5.13/series index 2b2ff96dab7..6221c25f2ac 100644 --- a/queue-5.13/series +++ b/queue-5.13/series @@ -221,7 +221,6 @@ bonding-3ad-fix-the-concurrency-between-__bond_relea.patch arm-dts-at91-use-the-right-property-for-shutdown-con.patch arm64-tegra-fix-tegra194-pcie-ep-compatible-string.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch asoc-intel-update-sof_pcm512x-quirks.patch bluetooth-fix-not-generating-rpa-when-required.patch dpaa2-switch-do-not-enable-the-dpsw-at-probe-time.patch diff --git a/queue-5.14/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-5.14/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index c79f6581442..00000000000 --- a/queue-5.14/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0af0fa0371eb376731a350bfdd8687e7ec206bb9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index 0a28a8095d3e..82af6279992d 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -1564,7 +1564,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-5.14/series b/queue-5.14/series index 609eb6c6bd3..ba1a5865479 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -251,7 +251,6 @@ bonding-3ad-fix-the-concurrency-between-__bond_relea.patch arm-dts-at91-use-the-right-property-for-shutdown-con.patch arm64-tegra-fix-tegra194-pcie-ep-compatible-string.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch asoc-intel-update-sof_pcm512x-quirks.patch bluetooth-fix-not-generating-rpa-when-required.patch dpaa2-switch-do-not-enable-the-dpsw-at-probe-time.patch diff --git a/queue-5.4/bpf-fix-off-by-one-in-tail-call-count-limiting.patch b/queue-5.4/bpf-fix-off-by-one-in-tail-call-count-limiting.patch deleted file mode 100644 index 393a3a6fec1..00000000000 --- a/queue-5.4/bpf-fix-off-by-one-in-tail-call-count-limiting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f07a898413cf953e803ad57683d5923fba52b71a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 28 Jul 2021 18:47:41 +0200 -Subject: bpf: Fix off-by-one in tail call count limiting - -From: Johan Almbladh - -[ Upstream commit b61a28cf11d61f512172e673b8f8c4a6c789b425 ] - -Before, the interpreter allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. -Now precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the -behavior of the x86 JITs. - -Signed-off-by: Johan Almbladh -Signed-off-by: Andrii Nakryiko -Acked-by: Yonghong Song -Link: https://lore.kernel.org/bpf/20210728164741.350370-1-johan.almbladh@anyfinetworks.com -Signed-off-by: Sasha Levin ---- - kernel/bpf/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index d9a3d995bd96..0dd3cdb67dd8 100644 ---- a/kernel/bpf/core.c -+++ b/kernel/bpf/core.c -@@ -1490,7 +1490,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack) - - if (unlikely(index >= array->map.max_entries)) - goto out; -- if (unlikely(tail_call_cnt > MAX_TAIL_CALL_CNT)) -+ if (unlikely(tail_call_cnt >= MAX_TAIL_CALL_CNT)) - goto out; - - tail_call_cnt++; --- -2.30.2 - diff --git a/queue-5.4/series b/queue-5.4/series index ac52180fa51..0d5aaa09991 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -116,7 +116,6 @@ workqueue-fix-possible-memory-leaks-in-wq_numa_init.patch bonding-3ad-fix-the-concurrency-between-__bond_relea.patch arm64-tegra-fix-tegra194-pcie-ep-compatible-string.patch asoc-intel-bytcr_rt5640-move-platform-clock-routes-t.patch -bpf-fix-off-by-one-in-tail-call-count-limiting.patch media-imx258-rectify-mismatch-of-vts-value.patch media-imx258-limit-the-max-analogue-gain-to-480.patch media-v4l2-dv-timings.c-fix-wrong-condition-in-two-f.patch