From patchwork Thu Oct 21 12:23:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1544332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ejsb79id; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HZmrB70qpz9sS8 for ; Thu, 21 Oct 2021 23:24:25 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mdX7G-0002rk-FY; Thu, 21 Oct 2021 12:24:14 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mdX7D-0002qu-KS for kernel-team@lists.ubuntu.com; Thu, 21 Oct 2021 12:24:11 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 76CC640010 for ; Thu, 21 Oct 2021 12:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634819051; bh=ln4ePXD17l195o3JZVR0/2GiTT0ZVR3nr3+ie4Obm6g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ejsb79iddwbVaFsryS4raCVsK8j59bxrRTOekWw1u/p6SqabIo0z8L++fqEGCqATl xmeKZDDnA+TJjxIziVl6/u07w2TBaQr4RdspelP1x/nMM7oZaaPfWKszsP53nilG76 4/V23dHsbz2RgVr6snT6zFYLVGwbfrqeuDqCDQE2ivIQn/wmBoU6zqTZgIOgEewo/7 zWyJEYZf77JAWe2pkaYwhJCIS6gEcEm0wJRAvlbuY3mVw2GO6Dm1u4VdGW/WMVUOGL mHhJ9VjGX3b75xZhckRp2170e7ctI+/3L0rUKRn01UaQ6JK4QuB+3UuwLsYdg7Ww60 zujJ3Q1Ob0Nsg== Received: by mail-pl1-f199.google.com with SMTP id w4-20020a1709029a8400b00138e222b06aso117565plp.12 for ; Thu, 21 Oct 2021 05:24:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ln4ePXD17l195o3JZVR0/2GiTT0ZVR3nr3+ie4Obm6g=; b=WbRUZMRChkAbvDEfNKderfd/rS/j8v010sP6RartJWFXDE0kCdI/7hi1HUlomWX5NY OVwe8FnXGjrSjA/kRynRS9qzKtGskZGiteJWwNWQMETaOgncS5fLLE0xb9L4nNnKiWO8 ye7qtqOKKWBfGyrTuAiOUQM1xHyjLnFEHXo9+WtGv40iif4TtnqKL4A5XPEUCvKDQhlC E15VUFMLSOZf35PkrUmIZ8NdOXwqak6WaKH6z6OQ6tyO3HTt0hcQWhj/qbtdT4qwTIVZ geaueGLRQR/+ETqZWyWvasJLqa9X9/ALo2nCWWNIAM2zExJfcLhGjsw7Mb0MDGAnbgyh E8uQ== X-Gm-Message-State: AOAM532QYjj+mSPauf9wrfKogA6YiL7VGnkv8RskMYiT1k2rgh/f1ifE Jyv2nzSLORK8yuEoCG0m4Iu4dgUMiKJGFMXSSh8IXe31a9tT6rBaw7n+GPmqlO9MhpjQTsdHo2k NQFKb1pgvuvzPSs7+s8LAadVaICxPlTcPu8y9nyzJuw== X-Received: by 2002:a63:7219:: with SMTP id n25mr4144187pgc.258.1634819049798; Thu, 21 Oct 2021 05:24:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIbvRGhBxR4NOVw3/nBMPz64wUSCGorEiah4qjgapNSwECwu3aLoDyuGRMo77Jv2OfCQQ5Bw== X-Received: by 2002:a63:7219:: with SMTP id n25mr4144169pgc.258.1634819049569; Thu, 21 Oct 2021 05:24:09 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id g25sm5192869pge.12.2021.10.21.05.24.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 05:24:09 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/7][Focal/linux-azure] net: mana: Fix a memory leak in an error handling path in 'mana_create_txq()' Date: Thu, 21 Oct 2021 06:23:36 -0600 Message-Id: <20211021122400.10390-3-tim.gardner@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211021122400.10390-1-tim.gardner@canonical.com> References: <20211021122400.10390-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Christophe JAILLET BugLink: https://bugs.launchpad.net/bugs/1947859 If this test fails we must free some resources as in all the other error handling paths of this function. Fixes: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)") Signed-off-by: Christophe JAILLET Reviewed-by: Dexuan Cui Signed-off-by: David S. Miller (cherry picked from commit b90788459cd6d140171b046f0b37fad341ade0a3) Signed-off-by: Tim Gardner --- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 02aff16df27f0..8fdf0104c4155 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1231,8 +1231,10 @@ static int mana_create_txq(struct mana_port_context *apc, cq->gdma_id = cq->gdma_cq->id; - if (WARN_ON(cq->gdma_id >= gc->max_num_cqs)) - return -EINVAL; + if (WARN_ON(cq->gdma_id >= gc->max_num_cqs)) { + err = -EINVAL; + goto out; + } gc->cq_table[cq->gdma_id] = cq->gdma_cq;