From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f41.google.com (mail-pz2-f41.google.com [74.125.228.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A132F4CCDDB for ; Mon, 21 Sep 2026 15:42:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790005345; cv=none; b=uiRhFLklwNvB3C+R8i09Y+PWLSHMdJG2jkxk5mreyzFdHenkrapt0xbtC8oDCceSlZkRx8e8KWFdGEq+ButL4mx72/v476kFcRVgbCcmYRLLwfkLhcNXdUcUWEdmYoqaROj/e3WFT/SUx9we1aEkN5oezEDjJgvqWM8U4qzh8Rc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790005345; c=relaxed/simple; bh=lRZjMrGJtMkO5fjKjctGS+IB0XlrEM2bLj8+OXK50P8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t9rK+g7VEwOORDHmzS0v10RzzrBx9DKQC1dmyMR8WAzu3hxlmXlgT8psxvB9/vWHlKGYvgnzLWi6OZunvw+OUmuTRLsROW0p+N/Xc6PSlp11hC2nXgmzb+FWku6ZLh/RfZkRHZbwQaqMfOHvMI3cndDg68CE6057iUU1Jb9jvZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LWSjkzkA; arc=none smtp.client-ip=74.125.228.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LWSjkzkA" Received: by mail-pz2-f41.google.com with SMTP id d2e1a72fcca58-8692a8568e9so2663415b3a.3 for ; Mon, 21 Sep 2026 08:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790005343; x=1790610143; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=UvCNVHGgMCfVbha0X/YNf7Xfe8skNfPu5j6zn9xlEcI=; b=LWSjkzkAxtngWvNPj+ec2XnJNetA4WlVoAxfp6GBSUuAVxgvUmmtr0gEEdy95h0HMI VR+wIHYLA0qMjd2RSNJdid3HSbBaRczUF6O5hYg06mgYeT8izXmpOGTPh5maK2WcMjqs f+yPkTomLK6SsRJzuQbujYfIvZA3jM61fkWKGZAYz9ay/NNSIZlQaHA9JbsKuauUFwIr 0/Vv4+MmS0IYiw76JnjR10ewGaeZ2Qn/Udcgw78Rormfm26Eo2ViYfA9AVe8JcTdT8NL ETD3nwXswJ7W92kdys9T/7rNAkNb38AdIYg5XnFkytWjanjiOsQMNFe8gPv4p8GS4WVV TVIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790005343; x=1790610143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=UvCNVHGgMCfVbha0X/YNf7Xfe8skNfPu5j6zn9xlEcI=; b=HbUhBMMU+GhBDh23mUD5ro+54ytSjRpltUWfYw36hIjKWU/JjY/Eduu9z50WgZeoCm 9wyILeUjjTY+yI0BRwjqB9MhS6DbAsbFZKgb5M8vMFtcGvuJO/efLDRVrmvGEzLLr6u0 v1BgroHDdCMtjTiyL/1ZpKqEghRBnyl9/D7JeacDPuczjh5MscadQq2V+eY5NPaeabph t0pAicyvsxRdYOyIi3+BqDJ1lY/ALxb4IBQB5pYstoy0drQP7K3qlDtiLdDagr3y+VgT 2KJKlYFCDouHqiOtvT8vIUZDXswpRK0OMGWFrq11lK0nXi+ZxVFnaRgZRQe/Qhf3+t7O se0w== X-Forwarded-Encrypted: i=1; AKwUvBxrUpr49iKE7dCkSxB6RvpkYgCIRkNb47arLXAQSQo4tjkWxOQE65ouO4KSJIEi6iVB7KzdzDc=@vger.kernel.org X-Gm-Message-State: AFuF++mv/8Kud9HsmCdCqp0pUBzNjihIA677cgX88c0gq/3Y6+Mc7gvq O6I9C1IvRn9VkyyujDfbkKQqWdhOkmdv0+X6qzXhc/+iA8UGVJEHVHQp X-Gm-Gg: AYBFou1A2hwVoF1kD/OR1yeeOJZ5szeYAkGFbJiB8wgICL5Y92+CgYzIwM0V3WQpz1e H7RIzVslA4tPSNXo9zoL4YIjqL6jbhQ9T0lYCLKMMeX+0F3cveyW/u2edFqKkV1WIN4CTJGKl1V d21x+ySx9Ex86BBbpyvBbni//sCN8Pay3EBSGrIyZu9zuMXQW/rQ/ezcFOIMZM28/+zHy4LtwO+ BRDlvC2vQAS0tEJoESbpGajldZ+49nxl6Ur2Gv5Njce5Lph74pzTotKKmE88z2ZOdkH/pO2Qd19 4qTyooUNmQTd+UXIPbMiv9apxXbHtWsb4nbvdgwdtK+QDNDdHhU6LJsKZPP87gv6WC5mEHP7dy4 nYUEGVp6rCm76Ejf+2PwMCRwKkrGclmsyLlP/F4q0yBrsl9n60eWNXOR7r39rxkLJI1l4mF/V9g 6+CXJChEAaYPygBpfrq0v3Of3HUjYX7NgWO91hA1G2JxR0RYn+5KnFpFy9ixu8XncU X-Received: by 2002:a05:6a00:856:b0:848:4859:a45 with SMTP id d2e1a72fcca58-874db7f4b04mr16549838b3a.2.1790005342833; Mon, 21 Sep 2026 08:42:22 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1002::de93]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-877aa70200esm3449599b3a.61.2026.09.21.08.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2026 08:42:22 -0700 (PDT) From: Guangshuo Li To: Arthur Kiyanovski , David Arinzon , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Guangshuo Li , Ioana Ciornei , Sang-Heon Jeon , Dawei Feng , Amit Bernstein , Netanel Belgazal , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Subject: [PATCH v2 1/2] net: ena: fix PHC cleanup on probe failure Date: Mon, 21 Sep 2026 23:42:01 +0800 Message-ID: <20260921154202.471662-2-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921154202.471662-1-lgs201920130244@gmail.com> References: <20260921154202.471662-1-lgs201920130244@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ena_probe() initializes the PHC as part of ena_device_init(), but the probe failure path does not destroy it before freeing the PHC private data. The normal removal path calls ena_phc_destroy() through ena_destroy_device() before ena_phc_free(). However, if probe fails after ena_device_init() succeeds, the error path reaches ena_phc_free() without unregistering the PTP clock or destroying the device PHC resources. Call ena_phc_destroy() in the probe error path before freeing the PHC private data. This issue was found by manual code inspection. Fixes: e0ea34158ee8 ("net: ena: Add PHC support in the ENA driver") Cc: stable@vger.kernel.org Signed-off-by: Guangshuo Li --- drivers/net/ethernet/amazon/ena/ena_netdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index ea89619039d8..5f0864d16dd3 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -4122,6 +4122,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_device_destroy: ena_com_delete_host_info(ena_dev); ena_com_admin_destroy(ena_dev); + ena_phc_destroy(adapter); ena_devlink_destroy: ena_devlink_free(devlink); err_metrics_destroy: -- 2.43.0