From: Antoine Tenart <atenart@kernel.org>
To: moonafterrain@outlook.com
Cc: Sabrina Dubroca <sd@queasysnail.net>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
"Radu Pirea (NXP OSS)" <radu-nicolae.pirea@oss.nxp.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Yuhao Jiang <danisjiang@gmail.com>,
stable@vger.kernel.org
Subject: Re: [PATCH net] macsec: check offload ops before inserting TX tag
Date: Thu, 6 Aug 2026 14:35:30 +0200 [thread overview]
Message-ID: <anR9qnWz4-_hbUf5@kwain> (raw)
In-Reply-To: <20260805-macsec-fixes-v1-1-634d7679a030@outlook.com>
On Wed, Aug 05, 2026 at 12:52:10PM +0800, Junrui Luo via B4 Relay wrote:
> From: Junrui Luo <moonafterrain@outlook.com>
>
> macsec_insert_tx_tag() takes the ops pointer returned by
> macsec_get_ops() and dereferences it straight away:
>
> ops = macsec_get_ops(macsec, &ctx);
> skb_final_len = skb->len - ETH_HLEN + ops->needed_headroom +
> ops->needed_tailroom;
phydev is read again later in macsec_insert_tx_tag, that probably needs
a check too (I don't think it is used in practice).
> macsec_get_ops() returns NULL whenever the offload is no longer live:
> for MACSEC_OFFLOAD_PHY, macsec_check_offload() requires
> real_dev->phydev to still be attached.
From what I can tell the same issue could happen within
macsec_check_offload and __macsec_get_ops too (and so macsec_get_ops).
Also looks like handle_not_macsec has a similar construction, does it
need a check?
> phy_detach() clears real_dev->phydev, e.g. when the lower device is
> brought down and its driver calls phy_disconnect() from ndo_stop(),
> when the PHY driver is unbound, or when an SFP module is removed under
> phylink. A frame sent after that point reaches macsec_insert_tx_tag()
> with ops == NULL and oopses.
>
> Check the pointer, as every other macsec_get_ops() caller already
> does, and drop the frame through the existing cleanup path.
Looking at phy_detach, could the PHY device also get freed? If so things
could get wild, but that is probably out of scope here.
> Fixes: a73d8779d61a ("net: macsec: introduce mdo_insert_tx_tag")
> Reported-by: Yuhao Jiang <danisjiang@gmail.com>
> Assisted-by: Claude:claude-opus-5
> Cc: stable@vger.kernel.org
> Signed-off-by: Junrui Luo <moonafterrain@outlook.com>
> ---
> drivers/net/macsec.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
> index ee0e2eb7dbc6..86c8009dcfa9 100644
> --- a/drivers/net/macsec.c
> +++ b/drivers/net/macsec.c
> @@ -3436,6 +3436,11 @@ static struct sk_buff *macsec_insert_tx_tag(struct sk_buff *skb,
> int err;
>
> ops = macsec_get_ops(macsec, &ctx);
> + if (unlikely(!ops)) {
> + err = -EOPNOTSUPP;
> + goto cleanup;
> + }
> +
> skb_final_len = skb->len - ETH_HLEN + ops->needed_headroom +
> ops->needed_tailroom;
> if (unlikely(skb_final_len > macsec->real_dev->mtu)) {
>
> ---
> base-commit: 075b74841bd0065a3bda3440873c747938e69b68
> change-id: 20260805-macsec-fixes-d280baf70552
>
> Best regards,
> --
> Junrui Luo <moonafterrain@outlook.com>
>
>
next prev parent reply other threads:[~2026-08-06 12:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-05 4:52 Junrui Luo via B4 Relay
2026-08-06 12:35 ` Antoine Tenart [this message]
2026-08-10 21:50 ` Jakub Kicinski
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=anR9qnWz4-_hbUf5@kwain \
--to=atenart@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=danisjiang@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=moonafterrain@outlook.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=radu-nicolae.pirea@oss.nxp.com \
--cc=sd@queasysnail.net \
--cc=stable@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
all inboxes | Powered by JetHome®