From nobody Fri Dec 19 19:55:15 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F0A2C04A95 for ; Sat, 22 Oct 2022 09:17:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230514AbiJVJR1 (ORCPT ); Sat, 22 Oct 2022 05:17:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231882AbiJVJQj (ORCPT ); Sat, 22 Oct 2022 05:16:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75D6B2E2B94; Sat, 22 Oct 2022 01:31:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 414AD60B09; Sat, 22 Oct 2022 08:01:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35ED7C433C1; Sat, 22 Oct 2022 08:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425707; bh=86sBV2qtfryQCC0tnr7qDvXObYavIWhzE4hrzmMFdMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s2xGAEsI2sVfb7FRSVvjPfYzPWYqa7MnynhUqAwiIHOi4udR9QxUDE0Us36H8aLnS ozkb8M3EnQgdJxUGNugM6mYOD4mKMF52xi2dfnVWRl9gGZIFJZhMhxq8SQvk0RfM10 gqMKuSF9XtlKsPQ1/5tUEmCI3EoEGQhSe9N6Mz2g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jacob Keller , Tony Nguyen , Sasha Levin , Gurucharan Subject: [PATCH 5.19 559/717] ice: set tx_tstamps when creating new Tx rings via ethtool Date: Sat, 22 Oct 2022 09:27:18 +0200 Message-Id: <20221022072523.106448179@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jacob Keller [ Upstream commit b3b173745c8cab1e24d6821488b60abed3acb24d ] When the user changes the number of queues via ethtool, the driver allocates new rings. This allocation did not initialize tx_tstamps. This results in the tx_tstamps field being zero (due to kcalloc allocation), and would result in a NULL pointer dereference when attempting a transmit timestamp on the new ring. Signed-off-by: Jacob Keller Tested-by: Gurucharan (A Contingent worker at Int= el) Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/eth= ernet/intel/ice/ice_ethtool.c index 4efa5e5846e0..4dfdec11ddc1 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -2826,6 +2826,7 @@ ice_set_ringparam(struct net_device *netdev, struct e= thtool_ringparam *ring, tx_rings[i].count =3D new_tx_cnt; tx_rings[i].desc =3D NULL; tx_rings[i].tx_buf =3D NULL; + tx_rings[i].tx_tstamps =3D &pf->ptp.port.tx; err =3D ice_setup_tx_ring(&tx_rings[i]); if (err) { while (i--) --=20 2.35.1