mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
12f12df569
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.55 Added the following default ksym to target/linux/generic/config-6.6: CONFIG_PROC_MEM_ALWAYS_FORCE=y # CONFIG_PROC_MEM_FORCE_PTRACE is not set # CONFIG_PROC_MEM_NO_FORCE is not set Removed upstreamed: generic/backport-6.6/780-23-v6.12-r8169-Fix-spelling-mistake-tx_underun-tx_underrun.patch[1] generic/backport-6.6/780-25-v6.12-r8169-add-tally-counter-fields-added-with-RTL8125.patch[2] generic/pending-6.6/684-gso-fix-gso-fraglist-segmentation-after-pull-from-fr.patch[3] lantiq/patches-6.6/0025-v6.12-net-ethernet-lantiq_etop-fix-memory-disclosure.patch[4] Manually rebased: bcm27xx/patches-6.6/950-0086-Main-bcm2708-bcm2709-linux-port.patch bcm27xx/patches-6.6/950-0998-i2c-designware-Add-support-for-bus-clear-feature.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=f02fcb7283b1c25f7e3ae07d7a2c830e06eb1a62 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=1c723d785adb711496bc64c24240f952f4faaabf 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=af3122f5fdc0d00581d6e598a668df6bf54c9daa 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=e66e38d07b31e177ca430758ed97fbc79f27d966 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16655 Signed-off-by: Nick Hainke <vincent@systemli.org>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 1eb2cded45b35816085c1f962933c187d970f9dc Mon Sep 17 00:00:00 2001
|
|
From: Eric Dumazet <edumazet@google.com>
|
|
Date: Mon, 6 May 2024 10:28:12 +0000
|
|
Subject: [PATCH] net: annotate writes on dev->mtu from ndo_change_mtu()
|
|
|
|
Simon reported that ndo_change_mtu() methods were never
|
|
updated to use WRITE_ONCE(dev->mtu, new_mtu) as hinted
|
|
in commit 501a90c94510 ("inet: protect against too small
|
|
mtu values.")
|
|
|
|
We read dev->mtu without holding RTNL in many places,
|
|
with READ_ONCE() annotations.
|
|
|
|
It is time to take care of ndo_change_mtu() methods
|
|
to use corresponding WRITE_ONCE()
|
|
|
|
Signed-off-by: Eric Dumazet <edumazet@google.com>
|
|
Reported-by: Simon Horman <horms@kernel.org>
|
|
Closes: https://lore.kernel.org/netdev/20240505144608.GB67882@kernel.org/
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Acked-by: Shannon Nelson <shannon.nelson@amd.com>
|
|
Link: https://lore.kernel.org/r/20240506102812.3025432-1-edumazet@google.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/8139cp.c | 4 ++--
|
|
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/8139cp.c
|
|
+++ b/drivers/net/ethernet/realtek/8139cp.c
|
|
@@ -1277,14 +1277,14 @@ static int cp_change_mtu(struct net_devi
|
|
|
|
/* if network interface not up, no need for complexity */
|
|
if (!netif_running(dev)) {
|
|
- dev->mtu = new_mtu;
|
|
+ WRITE_ONCE(dev->mtu, new_mtu);
|
|
cp_set_rxbufsize(cp); /* set new rx buf size */
|
|
return 0;
|
|
}
|
|
|
|
/* network IS up, close it, reset MTU, and come up again. */
|
|
cp_close(dev);
|
|
- dev->mtu = new_mtu;
|
|
+ WRITE_ONCE(dev->mtu, new_mtu);
|
|
cp_set_rxbufsize(cp);
|
|
return cp_open(dev);
|
|
}
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -3952,7 +3952,7 @@ static int rtl8169_change_mtu(struct net
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
|
|
- dev->mtu = new_mtu;
|
|
+ WRITE_ONCE(dev->mtu, new_mtu);
|
|
netdev_update_features(dev);
|
|
rtl_jumbo_config(tp);
|
|
rtl_set_eee_txidle_timer(tp);
|