From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5FF701B395B; Mon, 23 Dec 2024 16:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734970314; cv=none; b=lsomchTfw5somC+rGDJBkuHHZz3IXliwq0OxmrEyFRelZqOp0N145ONgHArsoGRtOhJ/OZxDam2vE5pdGuiC+zB8074GteDKAzeWajYq7uT+og9MDlF9OOPz+t18RlPG7qwAnvA/UTQpA3yTWsvt6d4TuzpeOFj12HcqIZ7OOQ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734970314; c=relaxed/simple; bh=VjOlpR4dfJC3wUdRNJreVQ+pGCfqPUeI1JHa+zPFTGo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YK8GRdGfptt+GI8UMr+iRl6eQfFmpIvgGxZ1SOz4lSPWwhWBzg+AQ1bzMbtLxQER8zEvFcgvA/gAwbUqwlQwwfgL6nJ5WeuEe/z8MuGNStDf8pwpz+8uHjcnAg0aEOU63c0+h5pORsWmRy38S1DYpT/S7exPdrC7SU33rApT5S0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KN9ofkCg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KN9ofkCg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C88E4C4CED3; Mon, 23 Dec 2024 16:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734970314; bh=VjOlpR4dfJC3wUdRNJreVQ+pGCfqPUeI1JHa+zPFTGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KN9ofkCgFFMkizjz1Y9ZIdJkxpL80ypTsd3bDEPoSRngqT+E7CXgiFCZQKuFK63xc WBF4ubGku+8vPhBAJqgFgOQYHaTzmNHLAm8Tvn/hF8L+XXRR9MbpEldlZQlW53HKZq zGDGUUkFSXeTA7TJFpofBjPryIT8MK8O9Zu9YPg0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Brett Creeley , Shannon Nelson , Jacob Keller , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 047/116] ionic: Fix netdev notifier unregister on failure Date: Mon, 23 Dec 2024 16:58:37 +0100 Message-ID: <20241223155401.386880208@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241223155359.534468176@linuxfoundation.org> References: <20241223155359.534468176@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Brett Creeley [ Upstream commit 9590d32e090ea2751e131ae5273859ca22f5ac14 ] If register_netdev() fails, then the driver leaks the netdev notifier. Fix this by calling ionic_lif_unregister() on register_netdev() failure. This will also call ionic_lif_unregister_phc() if it has already been registered. Fixes: 30b87ab4c0b3 ("ionic: remove lif list concept") Signed-off-by: Brett Creeley Signed-off-by: Shannon Nelson Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20241212213157.12212-2-shannon.nelson@amd.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 9d724d228b83..bc7c5cd38596 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -3736,8 +3736,8 @@ int ionic_lif_register(struct ionic_lif *lif) /* only register LIF0 for now */ err = register_netdev(lif->netdev); if (err) { - dev_err(lif->ionic->dev, "Cannot register net device, aborting\n"); - ionic_lif_unregister_phc(lif); + dev_err(lif->ionic->dev, "Cannot register net device: %d, aborting\n", err); + ionic_lif_unregister(lif); return err; } -- 2.39.5