netdev - [PATCH] net: ethernet: miss media cleanup behavior

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241106141152.1943-1-liangwentao@iscas.ac.cn>
Date: Wed,  6 Nov 2024 22:11:52 +0800
From: Wentao Liang <liangwentao@...as.ac.cn>
To: viro@...iv.linux.org.uk
Cc: netdev@...r.kernel.org,
	Wentao Liang <liangwentao@...as.ac.cn>
Subject: [PATCH] net: ethernet: miss media cleanup behavior

In the de21041_media_timer(), line 1081, when media type is locked,
the code jumps to line 1136 to perform cleanup operations. However,
in the de21040_media_timer(), line 991, the same condition leads to
an immediate return without any cleanup.

To address this inconsistency, we have added a jump statement to the
de21040_media_timer() to ensure that cleanup operations are executed
before the function returns.

Signed-off-by: Wentao Liang <liangwentao@...as.ac.cn>
---
 drivers/net/ethernet/dec/tulip/de2104x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 0a161a4db242..724c0b3b3966 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -988,7 +988,7 @@ static void de21040_media_timer (struct timer_list *t)
 	de_link_down(de);
 
 	if (de->media_lock)
-		return;
+		goto set_media;
 
 	if (de->media_type == DE_MEDIA_AUI) {
 		static const u32 next_state = DE_MEDIA_TP;
@@ -998,6 +998,7 @@ static void de21040_media_timer (struct timer_list *t)
 		de_next_media(de, &next_state, 1);
 	}
 
+set_media:
 	spin_lock_irqsave(&de->lock, flags);
 	de_stop_rxtx(de);
 	spin_unlock_irqrestore(&de->lock, flags);
-- 
2.42.0.windows.2