From: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
To: intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com,
aleksandr.loktionov@intel.com
Cc: netdev@vger.kernel.org,
Katarzyna Wieczerzycka <katarzyna.wieczerzycka@intel.com>
Subject: [PATCH] ice: add missing reset of the mac header
Date: Fri, 20 Mar 2026 06:05:18 +0100 [thread overview]
Message-ID: <20260320050518.422303-1-aleksandr.loktionov@intel.com> (raw)
From: Katarzyna Wieczerzycka <katarzyna.wieczerzycka@intel.com>
By default skb->mac_header is not set, so reset prevents access to an
invalid pointer.
Call skb_reset_mac_header() before accessing the mac header from skb.
Signed-off-by: Katarzyna Wieczerzycka <katarzyna.wieczerzycka@intel.com>
Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
---
drivers/net/ethernet/intel/ice/ice_txrx.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index a2cd4cf..374b17f 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -2211,6 +2211,8 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_tx_ring *tx_ring)
goto out_drop;
/* allow CONTROL frames egress from main VSI if FW LLDP disabled */
+ if (likely(!skb_mac_header_was_set(skb)))
+ skb_reset_mac_header(skb);
eth = (struct ethhdr *)skb_mac_header(skb);
if ((ice_is_switchdev_running(vsi->back) ||
--
2.52.0
next reply other threads:[~2026-03-20 5:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 5:05 Aleksandr Loktionov [this message]
2026-03-20 18:04 ` [PATCH] ice: add missing reset of the mac header Simon Horman
2026-03-20 19:53 ` Loktionov, Aleksandr
2026-03-21 9:14 ` Simon Horman
2026-03-26 14:14 ` Loktionov, Aleksandr
2026-03-24 18:02 ` [Intel-wired-lan] " Alexander Lobakin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260320050518.422303-1-aleksandr.loktionov@intel.com \
--to=aleksandr.loktionov@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=katarzyna.wieczerzycka@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox