diff options
| author | Markus Stockhausen | 2026-01-25 18:07:32 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-02-08 20:25:29 +0000 |
| commit | 21414937d11d4e75e2a7a11cbd6e36f243c2d4bb (patch) | |
| tree | ad556859c786f86076644bf67977e879cae68d2d | |
| parent | 0837be599dee9c13b83130b5effc2bb6faed4fa1 (diff) | |
| download | openwrt-21414937d11d4e75e2a7a11cbd6e36f243c2d4bb.tar.gz | |
realtek: dsa: rtl839x: fix uninitialized global access
Setup for DSA QOS on RTL839x accesses unitialized memory. For some
reason the handover of the priv structure was realized via global
intermediate variable switch_priv. During refactoring for adbb9a6
("realtek: dsa: rtl83xx: fix init section mismatch") this was not
noticed. Since then RTL839x devices crash during startup.
Fix this by using standard handover via function parameters.
Fixes: e81affb9 ("realtek: dsa: rtl83xx: fix init section mismatch")
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/21703
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit ac9646394482ba2e464ccf75e74c936485028305)
Link: https://github.com/openwrt/openwrt/pull/21900
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c index ff515bea10..e30ee51b70 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c @@ -6,8 +6,6 @@ #include "rtl83xx.h" -static struct rtl838x_switch_priv *switch_priv; - enum scheduler_type { WEIGHTED_FAIR_QUEUE = 0, WEIGHTED_ROUND_ROBIN, @@ -445,7 +443,7 @@ static void rtl839x_set_scheduling_queue_weights(struct rtl838x_switch_priv *pri mutex_unlock(&priv->reg_mutex); } -static void rtl838x_config_qos(void) +static void rtl838x_config_qos(struct rtl838x_switch_priv *priv) { u32 v; @@ -490,10 +488,9 @@ static void rtl838x_config_qos(void) sw_w32_mask(0, 7, RTL838X_QM_PKT2CPU_INTPRI_1); } -static void rtl839x_config_qos(void) +static void rtl839x_config_qos(struct rtl838x_switch_priv *priv) { u32 v; - struct rtl838x_switch_priv *priv = switch_priv; pr_info("Setting up RTL839X QoS\n"); pr_info("RTL839X_PRI_SEL_TBL_CTRL(i): %08x\n", sw_r32(RTL839X_PRI_SEL_TBL_CTRL(0))); @@ -549,12 +546,12 @@ static void rtl839x_config_qos(void) void rtldsa_838x_qos_init(struct rtl838x_switch_priv *priv) { - rtl838x_config_qos(); + rtl838x_config_qos(priv); rtl838x_rate_control_init(priv); } void rtldsa_839x_qos_init(struct rtl838x_switch_priv *priv) { - rtl839x_config_qos(); + rtl839x_config_qos(priv); rtl839x_rate_control_init(priv); } |