Message ID | 20211021122400.10390-16-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> 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=meOaUe3l; 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=<UNKNOWN>) 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 4HZmsN1Ndkz9sRR for <incoming@patchwork.ozlabs.org>; Thu, 21 Oct 2021 23:25:28 +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 <kernel-team-bounces@lists.ubuntu.com>) id 1mdX8J-0003Wq-37; Thu, 21 Oct 2021 12:25:19 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <tim.gardner@canonical.com>) id 1mdX7T-0002zS-Hf for kernel-team@lists.ubuntu.com; Thu, 21 Oct 2021 12:24:27 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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-1.canonical.com (Postfix) with ESMTPS id DDBA63FFF3 for <kernel-team@lists.ubuntu.com>; Thu, 21 Oct 2021 12:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634819065; bh=HVXHpW2HcvGWaO7DKzBaF5OCB+83b7t/haDVf2pzJhg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=meOaUe3lPgi5QKNiu7SzRfp3vOxh7lVGCYp4OB98l/bWeKnRI3gSwntXVAHkYGth3 NE8tYcBNSCo9sY2QU8FtLVe6/yxRsL/TrcqvrcAp1xdaLoF6kUe/ghicC4d4ZMzuK8 ohrkBFG4SY67HxwVE/Zaj67ej63bmSKQceXp5eNNMnOvvah6l4qI8aWJD5ujAStWI4 rTPooJqHiuwbgm2Jl8HMQTz4ExECq9SutqnaY4mBrhtINC12JAt1ro5Dz/7uqzdGAf e5t80jhKVwbddxZARzzYD65KMNpYfnLEiS9/NljQUFB5uUNIXkVNgd6MvPDffolnyY b2VjaYqWUPmHA== Received: by mail-pf1-f200.google.com with SMTP id x123-20020a626381000000b0044da6d19df6so335597pfb.3 for <kernel-team@lists.ubuntu.com>; Thu, 21 Oct 2021 05:24:25 -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=HVXHpW2HcvGWaO7DKzBaF5OCB+83b7t/haDVf2pzJhg=; b=IwdOwhFj7yJNhALbDYbfAtULXe3xuE9Alps/C8h0DgwX4XuCJgC25u+Cpg3lsgyV4u J/3wipxol7RCODYzb1P8V/Jvgmd/1Fd9vo13jTube8O5H6kV3DbKHI8YcAFj9SUeiJIe BVKB4WYjfQgkjg2pQoHf6CDsRTIu9khMBl2vLofEF1KYl74C9Z7RHEHNJ+fi9VHMiI5l jai96sE4Q2lyI8ksF5hQE4Z3EcBm4vywprgz03wxH33Nyh4R4kdzOguCsUh7XaMUt9LY +ddmU2rCqW0c5OAw554k60er0DOlTcIaYIfuuRs4hzndEIWzWAsyybLrJeEGD5fDh6CT bHzg== X-Gm-Message-State: AOAM530Enz091cLgZjvUrFMuF0scQUdmBpKSM3UWAsp/lbJqeE68/cn0 xA1HiPoBWKO8rkGzk4bcmO5bWiP6j6MypATq6Hymx5MZQZWnbbmXllJxzGxWQ8qni9afvPDHpt3 HZx3J8mI5Rzp3dHv+5DaWIOE0iTSXUioCZs6VqJTYrA== X-Received: by 2002:a17:902:8bc4:b029:12b:8470:e29e with SMTP id r4-20020a1709028bc4b029012b8470e29emr4951768plo.2.1634819064325; Thu, 21 Oct 2021 05:24:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyv3bFTvHNr5cryu9uK2cZTEDZ3Gxj0TbGlFqlCYUNeZUY5y5ch08Yy5PovR+IkVRfTA/r7lA== X-Received: by 2002:a17:902:8bc4:b029:12b:8470:e29e with SMTP id r4-20020a1709028bc4b029012b8470e29emr4951744plo.2.1634819064073; Thu, 21 Oct 2021 05:24:24 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id g25sm5192869pge.12.2021.10.21.05.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 05:24:23 -0700 (PDT) From: Tim Gardner <tim.gardner@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 08/13][Hirsute/linux-azure] net: mana: Fix a memory leak in an error handling path in 'mana_create_txq()' Date: Thu, 21 Oct 2021 06:23:49 -0600 Message-Id: <20211021122400.10390-16-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 <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
Update Microsoft MANA to 5.15-rc6
|
expand
|
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 46aee2c49f1b..fff78900fc8a 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1230,8 +1230,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;