Commit 35710f0d authored by David Yang's avatar David Yang Committed by Jakub Kicinski
Browse files

macsec: fix memcpy with u64_stats 



On 64bit arches, struct u64_stats_sync is empty and provides no help
against load/store tearing. memcpy() should not be considered atomic
against u64 values. Use u64_stats_copy() instead.

Signed-off-by: default avatarDavid Yang <mmyangfl@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20260120092137.2161162-4-mmyangfl@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dd7fca9f

drivers/net/macsec.c

+3 −3
Original line number Diff line number Diff line
@@ -2806,7 +2806,7 @@ static void get_rx_sc_stats(struct net_device *dev, 
		stats = per_cpu_ptr(rx_sc->stats, cpu);

		do {

			start = u64_stats_fetch_begin(&stats->syncp);

			memcpy(&tmp, &stats->stats, sizeof(tmp));

			u64_stats_copy(&tmp, &stats->stats, sizeof(tmp));

		} while (u64_stats_fetch_retry(&stats->syncp, start));



		sum->InOctetsValidated += tmp.InOctetsValidated;
@@ -2887,7 +2887,7 @@ static void get_tx_sc_stats(struct net_device *dev, 
		stats = per_cpu_ptr(macsec_priv(dev)->secy.tx_sc.stats, cpu);

		do {

			start = u64_stats_fetch_begin(&stats->syncp);

			memcpy(&tmp, &stats->stats, sizeof(tmp));

			u64_stats_copy(&tmp, &stats->stats, sizeof(tmp));

		} while (u64_stats_fetch_retry(&stats->syncp, start));



		sum->OutPktsProtected   += tmp.OutPktsProtected;
@@ -2943,7 +2943,7 @@ static void get_secy_stats(struct net_device *dev, struct macsec_dev_stats *sum) 
		stats = per_cpu_ptr(macsec_priv(dev)->stats, cpu);

		do {

			start = u64_stats_fetch_begin(&stats->syncp);

			memcpy(&tmp, &stats->stats, sizeof(tmp));

			u64_stats_copy(&tmp, &stats->stats, sizeof(tmp));

		} while (u64_stats_fetch_retry(&stats->syncp, start));



		sum->OutPktsUntagged  += tmp.OutPktsUntagged;