Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp819696pxb; Tue, 3 Nov 2020 13:27:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJyChZbgGoYomcSjFvJQewdvyZEZpgAiNaNOuDwz99zD/xyh0GhuVOqx7gBivxpt6VDwgPxQ X-Received: by 2002:a05:6402:1a58:: with SMTP id bf24mr13815242edb.191.1604438858855; Tue, 03 Nov 2020 13:27:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604438858; cv=none; d=google.com; s=arc-20160816; b=pszWzDpLM+4xkgF7wdnLiUR76G0rNihZvxACR88kIH2ew/4TPWzWIR+j50KhMks3Tv hV0Z+OocISsM3qpQFwBVWGE8qxhh8uld/kAspkpplwZz48OVU8UVayKAVp09GBcMCVZe fU/6FLPGUCd1aWZUGSHPJrv8oayR1t4BwLYUVqjQGO4WUOAA94MyuI4yYdii/ncVod87 Z2p+VJlVWcckv6gmUIQQf9bh8gP2guDRtN8RCk4PJofYL29efJG4bIbGeZUp+sbKRBEm 7Yd9GM1qJaQejKHZNxnGcVwKN9OcuvalDoO3OivvVXGf7zvMu+8xZ8avMYV9+ErNebge SEkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gy3m2CW6NiRGG/4sRT9O63T8duo5j+Da11bkrGQVn20=; b=ofUFpiHUGLvwluflQndusB4wdfG96xsJeh9X/b4Mac4iy/TTKcvjTdzXOzsR3LmQWh +xBaXECjqfPS1AN5bgUoZADsxuzUic217SWubXI9+Bsi6y9EBxXmVNxi+1Olbr18AUyA Ln/LSPOOf93bX5+CX5AOPs1V6e2j06gEWed1YrnP1TmhbIQW6Q+kYnwI2jySuvO3Yb0G vU11WJ7yb0t2dzyXhof0WGTUF0KYuX/5gY/6vkCAq7H+Y4ESAI+BdTyBRgZOSZ75Ldx9 B6yrE14mkgYEUjG7hacu72W+6pkifAz159PzLKYmRDr/x/FgOsXMQO3W7/C09JTclPSC tfDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YltnnZ+Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j12si13788045edy.584.2020.11.03.13.27.15; Tue, 03 Nov 2020 13:27:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YltnnZ+Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387740AbgKCVFH (ORCPT + 99 others); Tue, 3 Nov 2020 16:05:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:40200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387709AbgKCVCz (ORCPT ); Tue, 3 Nov 2020 16:02:55 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A94120658; Tue, 3 Nov 2020 21:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437374; bh=a/MAjmMy+DQfP1T4fger6eIFtSlCPumXwPUZ4Gc5PUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YltnnZ+ZhG5A+SZ8DP4799T4HDohFjOGcrq7yCTmMDddgUUcvowYlBOPvKoI7VwUK Xs61QYyfVEU9qPhr5ZgiIZTDiUAJqq9nNhTW+Y/dpQtvFirH48saEGaXXXubiqqbCb LZlaYEbrBAisEKCBq7kCX/ERTpOUa32CL+YqwzS0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ido Schimmel , Vadim Pasternak , Oleksandr Shamray , Jakub Kicinski Subject: [PATCH 4.19 011/191] mlxsw: core: Fix memory leak on module removal Date: Tue, 3 Nov 2020 21:35:03 +0100 Message-Id: <20201103203234.131678601@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ido Schimmel [ Upstream commit adc80b6cfedff6dad8b93d46a5ea2775fd5af9ec ] Free the devlink instance during the teardown sequence in the non-reload case to avoid the following memory leak. unreferenced object 0xffff888232895000 (size 2048): comm "modprobe", pid 1073, jiffies 4295568857 (age 164.871s) hex dump (first 32 bytes): 00 01 00 00 00 00 ad de 22 01 00 00 00 00 ad de ........"....... 10 50 89 32 82 88 ff ff 10 50 89 32 82 88 ff ff .P.2.....P.2.... backtrace: [<00000000c704e9a6>] __kmalloc+0x13a/0x2a0 [<00000000ee30129d>] devlink_alloc+0xff/0x760 [<0000000092ab3e5d>] 0xffffffffa042e5b0 [<000000004f3f8a31>] 0xffffffffa042f6ad [<0000000092800b4b>] 0xffffffffa0491df3 [<00000000c4843903>] local_pci_probe+0xcb/0x170 [<000000006993ded7>] pci_device_probe+0x2c2/0x4e0 [<00000000a8e0de75>] really_probe+0x2c5/0xf90 [<00000000d42ba75d>] driver_probe_device+0x1eb/0x340 [<00000000bcc95e05>] device_driver_attach+0x294/0x300 [<000000000e2bc177>] __driver_attach+0x167/0x2f0 [<000000007d44cd6e>] bus_for_each_dev+0x148/0x1f0 [<000000003cd5a91e>] driver_attach+0x45/0x60 [<000000000041ce51>] bus_add_driver+0x3b8/0x720 [<00000000f5215476>] driver_register+0x230/0x4e0 [<00000000d79356f5>] __pci_register_driver+0x190/0x200 Fixes: a22712a96291 ("mlxsw: core: Fix devlink unregister flow") Signed-off-by: Ido Schimmel Reported-by: Vadim Pasternak Tested-by: Oleksandr Shamray Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1111,6 +1111,8 @@ void mlxsw_core_bus_device_unregister(st if (!reload) devlink_resources_unregister(devlink, NULL); mlxsw_core->bus->fini(mlxsw_core->bus_priv); + if (!reload) + devlink_free(devlink); return;