From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC5703B19B4; Tue, 25 Aug 2026 13:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787664716; cv=none; b=Rm6EFPwHlFw13B4JXEhx+Gx7UplcJ2Yd3GoMoqUV5mJMbfaQeS/uFeVKRCNjEqHJvpxlLnKdY2Z7G3LQ6WU0K8DR8n8GEckKHb0USMUMapkXbuC2OBQhwPR5CgvArv46/mgrWlimj0rzYoDDFaLgfKOu3M+CzUN42OqeGJXljxY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787664716; c=relaxed/simple; bh=PWZp9kybkBGZEWwI/jLAlYBV6TzG0n1t9hR5qgUQ7O0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RuUOZ1fz9OcbFNEgo6+xb3bZ0sRJqiUGX5IO61Rbi1uwcRrdR/pmwRSX6T69gZdwg6nom+eV1pSF533a/Rg3UJuV11eTe0szYQvrRqaqZC2e5xUFrYh4dhcsZT5zasqLGipDwdAAwulkiv/zdlMqD9OL0D6RfNBM/YZE6CRrGJw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vjLpwc1o; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vjLpwc1o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FA5A1F000E9; Tue, 25 Aug 2026 13:31:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787664713; bh=Yv1bgSP9YrmWwbaZrmMxSfNd8iQ9/z3On5clY9ac1MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vjLpwc1oCpAvls0kKslExIK5SK8qgCcuKHrs1azOJ/H8VwXVLMi9p4f38B7ppzLvf YWrATajlhJfR+Wn7ojw7GyMp03sI7el4QvgiYeWuUy7IsgCeGNhSKZ0yPUQSt33uv4 yUMd6XSg1jtsGFAAnMd+sl6OaaoEVQdc3Cw4tOGY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Si-Wei Liu , Shannon Nelson , Anand Khoje , Simon Horman , Brett Creeley , Paolo Abeni Subject: [PATCH 7.2 62/82] net/ionic: avoid OOB TX partner lookup for hwstamp RXQ Date: Tue, 25 Aug 2026 15:25:49 +0200 Message-ID: <20260825132543.952353483@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260825132541.560541185@linuxfoundation.org> References: <20260825132541.560541185@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anand Khoje commit d92255b405fb6f5acca408239ccd742e0a42c9cb upstream. The dedicated hardware timestamp RX queue is allocated with q->index equal to lif->ionic->nrxqs_per_lif. The normal txqcqs array only contains the regular queue pairs, so using that index to set rxq->partner can read one entry past txqcqs[] and then write through the derived pointer. Only link RX/TX partners for normal queue-pair indexes. Leave the hwstamp RX queue unpaired, and make the XDP_TX path abort cleanly if an RX queue has no TX partner. Fixes: 8eeed8373e1c ("ionic: Add XDP_TX support") Reviewed-by: Si-Wei Liu Reviewed-by: Shannon Nelson Cc: stable@vger.kernel.org Signed-off-by: Anand Khoje Reviewed-by: Simon Horman Reviewed-by: Brett Creeley Link: https://patch.msgid.link/20260813083705.454897-1-anand.a.khoje@oracle.com Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 17 +++++++++++++++-- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 7 ++++++- 2 files changed, 21 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -920,8 +920,21 @@ static int ionic_lif_rxq_init(struct ion }; int err; - q->partner = &lif->txqcqs[q->index]->q; - q->partner->partner = q; + q->partner = NULL; + + /* Only normal RX queues have matching TX queue partners. */ + if (q->index < lif->nxqs) { + if (!lif->txqcqs || + q->index >= lif->ionic->ntxqs_per_lif || + !lif->txqcqs[q->index]) { + dev_err(dev, "missing TX queue partner for RX queue %u\n", + q->index); + return -ENXIO; + } + + q->partner = &lif->txqcqs[q->index]->q; + q->partner->partner = q; + } if (!lif->xdp_prog || (lif->xdp_prog->aux && lif->xdp_prog->aux->xdp_has_frags)) --- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c @@ -545,13 +545,18 @@ static bool ionic_run_xdp(struct ionic_r break; case XDP_TX: + txq = rxq->partner; + if (unlikely(!txq)) { + err = -EIO; + break; + } + xdpf = xdp_convert_buff_to_frame(&xdp_buf); if (!xdpf) { err = -ENOSPC; break; } - txq = rxq->partner; nq = netdev_get_tx_queue(netdev, txq->index); __netif_tx_lock(nq, smp_processor_id()); txq_trans_cond_update(nq);