mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
8f638f9366
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91 Remove upstreamed patches: - airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1] - airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2] - airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3] - generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5] Manually rebased patches: - airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1] - ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4] - bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6] We also backported four patches to fix perf tool regression: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23444 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 05e090620bacf317020f9591cfff8926093380bd Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@linaro.org>
|
|
Date: Fri, 24 Oct 2025 14:23:35 +0300
|
|
Subject: [PATCH] net: airoha: Fix a copy and paste bug in probe()
|
|
|
|
This code has a copy and paste bug where it accidentally checks "if (err)"
|
|
instead of checking if "xsi_rsts" is NULL. Also, as a free bonus, I
|
|
changed the allocation from kzalloc() to kcalloc() which is a kernel
|
|
hardening measure to protect against integer overflows.
|
|
|
|
Fixes: 5863b4e065e2 ("net: airoha: Add airoha_eth_soc_data struct")
|
|
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
|
|
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/aPtht6y5DRokn9zv@stanley.mountain
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -3011,11 +3011,11 @@ static int airoha_probe(struct platform_
|
|
return err;
|
|
}
|
|
|
|
- xsi_rsts = devm_kzalloc(eth->dev,
|
|
- eth->soc->num_xsi_rsts * sizeof(*xsi_rsts),
|
|
+ xsi_rsts = devm_kcalloc(eth->dev,
|
|
+ eth->soc->num_xsi_rsts, sizeof(*xsi_rsts),
|
|
GFP_KERNEL);
|
|
- if (err)
|
|
- return err;
|
|
+ if (!xsi_rsts)
|
|
+ return -ENOMEM;
|
|
|
|
eth->xsi_rsts = xsi_rsts;
|
|
for (i = 0; i < eth->soc->num_xsi_rsts; i++)
|