From: Meghana Malladi <m-malladi@ti.com>
To: <diogo.ivo@siemens.com>, <philippe.schenker@impulsing.ch>,
<haokexin@gmail.com>, <devnexen@gmail.com>, <horms@kernel.org>,
<jacob.e.keller@intel.com>, <m-malladi@ti.com>,
<pabeni@redhat.com>, <kuba@kernel.org>, <edumazet@kernel.org>,
<davem@davemloft.net>, <andrew+netdev@lunn.ch>
Cc: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <srk@ti.com>,
Vignesh Raghavendra <vigneshr@ti.com>, <danishanwar@ti.com>
Subject: [PATCH net v3 1/3] net: ti: icssg-prueth: Fix TX timestamp cleanup crash
Date: Tue, 10 Nov 2026 17:56:59 +0530 [thread overview]
Message-ID: <20261110122700.1849634-2-m-malladi@ti.com> (raw)
In-Reply-To: <20261110122700.1849634-1-m-malladi@ti.com>
prueth_cleanup_tx_ts() incorrectly frees ERR_PTR(-EBUSY) slots. The TX
path reserves slots with ERR_PTR(-EBUSY) before storing the real skb
pointer. Use IS_ERR_OR_NULL() to skip these reserved slots during
cleanup, preventing NULL pointer dereference and freeing errors.
Fixes: e2dc7bfd677fc ("net: ti: icssg-prueth: Move common functions into a separate file")
Signed-off-by: Meghana Malladi <m-malladi@ti.com>
---
Changes from v2(v3-v2):
- Added this commit in the series which fixes the pre-existing issues
flagged by sashiko
drivers/net/ethernet/ti/icssg/icssg_common.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ti/icssg/icssg_common.c b/drivers/net/ethernet/ti/icssg/icssg_common.c
index 4a7d1a6f470b..8cb2ad2ebece 100644
--- a/drivers/net/ethernet/ti/icssg/icssg_common.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_common.c
@@ -1426,10 +1426,13 @@ void prueth_cleanup_tx_ts(struct prueth_emac *emac)
int i;
for (i = 0; i < PRUETH_MAX_TX_TS_REQUESTS; i++) {
- if (emac->tx_ts_skb[i]) {
+ /* Slot may hold ERR_PTR(-EBUSY) if the TX path reserved it
+ * but has not yet stored the real skb pointer. Skip the free
+ * but still clear the slot so it can be reused.
+ */
+ if (!IS_ERR_OR_NULL(emac->tx_ts_skb[i]))
dev_kfree_skb_any(emac->tx_ts_skb[i]);
- emac->tx_ts_skb[i] = NULL;
- }
+ emac->tx_ts_skb[i] = NULL;
}
}
EXPORT_SYMBOL_GPL(prueth_cleanup_tx_ts);
--
2.43.0
next prev parent reply other threads:[~2026-11-10 12:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-10 12:26 [PATCH net v3 0/3] Fix switch mode for offload and non-offload cases Meghana Malladi
2026-11-10 12:26 ` Meghana Malladi [this message]
2026-11-10 12:27 ` [PATCH net v3 2/3] net: ti: icssg-prueth: Fix phylib stop/start in emac_restart Meghana Malladi
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=20261110122700.1849634-2-m-malladi@ti.com \
--to=m-malladi@ti.com \
--cc=andrew+netdev@lunn.ch \
--cc=danishanwar@ti.com \
--cc=davem@davemloft.net \
--cc=devnexen@gmail.com \
--cc=diogo.ivo@siemens.com \
--cc=edumazet@kernel.org \
--cc=haokexin@gmail.com \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=philippe.schenker@impulsing.ch \
--cc=srk@ti.com \
--cc=vigneshr@ti.com \
/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®