From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B419C11F64 for ; Thu, 1 Jul 2021 20:32:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18B2D61263 for ; Thu, 1 Jul 2021 20:32:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236010AbhGAUeJ (ORCPT ); Thu, 1 Jul 2021 16:34:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235995AbhGAUeI (ORCPT ); Thu, 1 Jul 2021 16:34:08 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C242C061764 for ; Thu, 1 Jul 2021 13:31:36 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id a15so14071003lfr.6 for ; Thu, 01 Jul 2021 13:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IIqiTHzvPeiEeTMDYxBD0+2ajqNYadEaJR3wIFIk5BI=; b=as3k7HeJ7RWliEFqiLEQpPMum0otGZnYZUo51Xg+QYAp6caHf+/jTcAPvrHctTe651 eIBM2DOmqj8gxn5Dci1nsUGBjzi7wTE1xXbmw5h78e5++1GmFvbp3J8lv63UwZAsf6Ev 87Rz3v29NQ1My+XXslx3QCqbFXL7T+Ftiv9Vg3e190XYhRztREK/WrGBKkvq4KJyHgg3 2dPci++JR3wliN+DOlyLhZUnMkFvq2P2+txpK6EozsT79V8QRaUI37GuWEW2fAPwnoFl x/ZdcMSUeY5A41pgmnT/rlgDe3oJS+sg73oNyBxRJIoUfdr6o9Vnux0vTFPYSy/nrGDX pLNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IIqiTHzvPeiEeTMDYxBD0+2ajqNYadEaJR3wIFIk5BI=; b=oAbOQJTd7qxcKmyGAABPD6x/iZdrpffPlOV+gyfAC2rHaszah9uCmCGse2K+9/gIG0 vOWpACXfEoYjjUlKaLe4HlrVD6yN/5Pw4inhv80fOnkFR2qHBu/CY2bDy9WS4VLPDshf YH8IXjLoRD3g8HjCWaNgAO6HjQwDFyjtRAOrdebX8KhB6dPEfOo+TT0zpG8/SfIJIXsW VuON3P9plXI6C596Hs/RbBoCucamuFs8682K/ThbJCGpejO1uNSn/RSBaXQBUtEE8wXC aASoLTvyKnEk6I0/RWj9C1f1U5SzX3nRdq5NeciujDrehkiGujCQvRxcNiIjiRM3q/1q 06hw== X-Gm-Message-State: AOAM533PAIbIH6yaVUNGGdaA3ajxk7dqoReRmfzY42dfIxrP42PU79TY dCdqPdm1lg8KAE38uAWj/CF7Z6RhnfadIImiTG9lHw== X-Google-Smtp-Source: ABdhPJzPRISLX9bFvv96SpCwfJRfNJxbsLpLaGY7HN/9msigZ2lAicrh9p1LsfjuohprWcJWUGExVDXP1/Pw5xJb3eQ= X-Received: by 2002:ac2:5519:: with SMTP id j25mr1095541lfk.431.1625171494324; Thu, 01 Jul 2021 13:31:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Catherine Sullivan Date: Thu, 1 Jul 2021 13:30:57 -0700 Message-ID: Subject: Re: [PATCH net v2 1/2] gve: Fix an error handling path in 'gve_probe()' To: Christophe JAILLET Cc: Sagi Shahar , Jon Olson , David Miller , kuba@kernel.org, David Awogbemila , Willem de Bruijn , Yangchun Fu , Bailey Forrest , Kuo Zhao , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org On Thu, Jul 1, 2021 at 1:18 PM Christophe JAILLET wrote: > > If the 'register_netdev() call fails, we must release the resources > allocated by the previous 'gve_init_priv()' call, as already done in the > remove function. > > Add a new label and the missing 'gve_teardown_priv_resources()' in the > error handling path. > > Fixes: 893ce44df565 ("gve: Add basic driver framework for Compute Engine Virtual NIC") > Signed-off-by: Christophe JAILLET Reviewed-by: Catherine Sullivan > --- > v2: Fix a typo in the label name > The previous serie had 3 patches. Now their are only 2 > --- > drivers/net/ethernet/google/gve/gve_main.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c > index 867e87af3432..44262c9f9ec2 100644 > --- a/drivers/net/ethernet/google/gve/gve_main.c > +++ b/drivers/net/ethernet/google/gve/gve_main.c > @@ -1565,7 +1565,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > > err = register_netdev(dev); > if (err) > - goto abort_with_wq; > + goto abort_with_gve_init; > > dev_info(&pdev->dev, "GVE version %s\n", gve_version_str); > dev_info(&pdev->dev, "GVE queue format %d\n", (int)priv->queue_format); > @@ -1573,6 +1573,9 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > queue_work(priv->gve_wq, &priv->service_task); > return 0; > > +abort_with_gve_init: > + gve_teardown_priv_resources(priv); > + > abort_with_wq: > destroy_workqueue(priv->gve_wq); > > -- > 2.30.2 > Thanks for the fix!