From patchwork Tue Jan 14 22:50:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1223116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 47y5JW3pnVz9sR1; Wed, 15 Jan 2020 09:50:19 +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 1irV0q-0001Ue-0F; Tue, 14 Jan 2020 22:50:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1irV0o-0001UE-5y for kernel-team@lists.ubuntu.com; Tue, 14 Jan 2020 22:50:14 +0000 Received: from mail-qt1-f197.google.com ([209.85.160.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1irV0n-0000M2-Qw for kernel-team@lists.ubuntu.com; Tue, 14 Jan 2020 22:50:13 +0000 Received: by mail-qt1-f197.google.com with SMTP id z11so93643qts.1 for ; Tue, 14 Jan 2020 14:50:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lu8Jw0U2pvkw+rYFRyGk6NkCQPSg4h8xZOw6S4dvLAY=; b=VOMc0Qp0sZG/lB0mXtauIX16DQ0BErI1O7U3T4kCl+By/Au+jiLqklVJeLT9J4J7rY GZEE0MQFdvzJl3LSbnZNNHStqD1g8YiE5JJ6Ys88ibA5KrehcUiGhM6TUAhCk49HzneS KgxJ6bPnIB5mGX28KRrI/PJojVCuVkO350VpCdMUpu4FsBCWJM1PgaNiaiZ68Jy1PLGc I00E70pLFtRjmbXd5yZ7CF8JfMvpuBn2TGAOrDM6CvPbdNG+q19vqgRfGWordIMnnFAZ Tjx5sEy+xpLpdezKUuDtrxEa7xUe/GPzHFGwsa2KXj4k5zY6IpJR6FZaMTgYMMI9skln JY/g== X-Gm-Message-State: APjAAAWWAkca0NaeGvcrxa5oXZKIp988Oz6+QS4EsFtapZf9gSMdKG0x yT/4NV8XJWuEnkfzKNm660czfOZARz83MtZ5ex9D8YQGtXWSgYG+QVbh7PnCXKPG+eqobv9fG+m VLLGlh3GeKZ++CP2nugV95ijhOtfdqMAizoh0FpIL X-Received: by 2002:ad4:46e4:: with SMTP id h4mr23691184qvw.181.1579042212547; Tue, 14 Jan 2020 14:50:12 -0800 (PST) X-Google-Smtp-Source: APXvYqzeIJcGX4y85+R7yOK2ubArLlQHna3h//zhvw+TL2bIZk9XKX//a3kv5Am+Lo5AGmwdMYIr9g== X-Received: by 2002:ad4:46e4:: with SMTP id h4mr23691172qvw.181.1579042212279; Tue, 14 Jan 2020 14:50:12 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e6:37:65c4:8230:adf3:fb0c]) by smtp.gmail.com with ESMTPSA id m68sm7415033qke.17.2020.01.14.14.50.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2020 14:50:11 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [disco:linux PATCH 1/1] Revert "RDMA/cm: Fix memory leak in cm_add/remove_one" Date: Tue, 14 Jan 2020 19:50:06 -0300 Message-Id: <20200114225006.5433-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200114225006.5433-1-marcelo.cerri@canonical.com> References: <20200114225006.5433-1-marcelo.cerri@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" BugLink: https://bugs.launchpad.net/bugs/1859582 This reverts commit f56d075cabc10ddbcfc1bf2c8291c46995176a86. cm_remove_port_fs() in 5.0 doesn't behave as in upstream and the additional kfree(port) is not necessary. Signed-off-by: Marcelo Henrique Cerri --- drivers/infiniband/core/cm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 03cc9b0a235c..37980c7564c0 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -4431,7 +4431,6 @@ static void cm_add_one(struct ib_device *ib_device) error1: port_modify.set_port_cap_mask = 0; port_modify.clr_port_cap_mask = IB_PORT_CM_SUP; - kfree(port); while (--i) { if (!rdma_cap_ib_cm(ib_device, i)) continue; @@ -4440,7 +4439,6 @@ static void cm_add_one(struct ib_device *ib_device) ib_modify_port(ib_device, port->port_num, 0, &port_modify); ib_unregister_mad_agent(port->mad_agent); cm_remove_port_fs(port); - kfree(port); } free: device_unregister(cm_dev->device); @@ -4495,7 +4493,6 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data) spin_unlock_irq(&cm.state_lock); ib_unregister_mad_agent(cur_mad_agent); cm_remove_port_fs(port); - kfree(port); } device_unregister(cm_dev->device);