Commit 087bdace authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Luo Gengkun
Browse files

r8169: add tally counter fields added with RTL8125 

stable inclusion
from stable-v5.10.227
commit 991e8b0bab669b7d06927c3e442b3352532e8581
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYR9Q
CVE: CVE-2024-49973

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=991e8b0bab669b7d06927c3e442b3352532e8581



--------------------------------

[ Upstream commit ced8e8b8f40accfcce4a2bbd8b150aa76d5eff9a ]

RTL8125 added fields to the tally counter, what may result in the chip
dma'ing these new fields to unallocated memory. Therefore make sure
that the allocated memory area is big enough to hold all of the
tally counter values, even if we use only parts of it.

Fixes: f1bce4ad ("r8169: add support for RTL8125")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/741d26a9-2b2b-485d-91d9-ecb302e345b5@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Conflicts:
	drivers/net/ethernet/realtek/r8169_main.c
[Missing previous patch 8df9439389a4, fix this conflict]
Signed-off-by: default avatarLuo Gengkun <luogengkun2@huawei.com>
parent 4233328a

drivers/net/ethernet/realtek/r8169_main.c

+27 −0
Original line number Diff line number Diff line
@@ -570,6 +570,33 @@ struct rtl8169_counters { 
	__le32	rx_multicast;

	__le16	tx_aborted;

	__le16	tx_underun;

	/* new since RTL8125 */

	__le64 tx_octets;

	__le64 rx_octets;

	__le64 rx_multicast64;

	__le64 tx_unicast64;

	__le64 tx_broadcast64;

	__le64 tx_multicast64;

	__le32 tx_pause_on;

	__le32 tx_pause_off;

	__le32 tx_pause_all;

	__le32 tx_deferred;

	__le32 tx_late_collision;

	__le32 tx_all_collision;

	__le32 tx_aborted32;

	__le32 align_errors32;

	__le32 rx_frame_too_long;

	__le32 rx_runt;

	__le32 rx_pause_on;

	__le32 rx_pause_off;

	__le32 rx_pause_all;

	__le32 rx_unknown_opcode;

	__le32 rx_mac_error;

	__le32 tx_underrun32;

	__le32 rx_mac_missed;

	__le32 rx_tcam_dropped;

	__le32 tdu;

	__le32 rdu;

};



struct rtl8169_tc_offsets {