mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-02-14 10:09:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

realtek: dsa: rtl839x: fix uninitialized global access

Browse source 
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 ac96463944)
Link: https://github.com/openwrt/openwrt/pull/21900
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Markus Stockhausen 2026-01-25 19:07:32 +01:00 • committed by Hauke Mehrtens
parent 0837be599d
commit 21414937d1
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c
View file

@ -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);
}