]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
macsec: fix memcpy with u64_stats
authorDavid Yang <mmyangfl@gmail.com>
Tue, 20 Jan 2026 09:21:31 +0000 (17:21 +0800)
committerJakub Kicinski <kuba@kernel.org>
Sun, 25 Jan 2026 21:14:11 +0000 (13:14 -0800)
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: David Yang <mmyangfl@gmail.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20260120092137.2161162-4-mmyangfl@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/macsec.c

index 5200fd5a10e5c6b955af9b9c163a510d90cc5a99..c2cb2d20976b608030da33009621ecc68c628419 100644 (file)
@@ -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;