From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753423AbdEPNqD (ORCPT ); Tue, 16 May 2017 09:46:03 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35316 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017AbdEPNpr (ORCPT ); Tue, 16 May 2017 09:45:47 -0400 Date: Tue, 16 May 2017 15:45:45 +0200 From: Johan Hovold To: Mika Westerberg Cc: Srinivas Kandagatla , linux-kernel@vger.kernel.org Subject: Re: [PATCH] nvmem: core: Prevent memory leak when device is unregistered Message-ID: <20170516134545.GO3657@localhost> References: <20170515111323.10640-1-mika.westerberg@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170515111323.10640-1-mika.westerberg@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 15, 2017 at 02:13:23PM +0300, Mika Westerberg wrote: > The nvmem_unregister() calls device_del() for the device but forgets to > call put_device() to actually release the device object which causes > that memory to be leaked. > > Fix this by calling device_unregister() for the device intead which also > calls put_device() for the device releasing it eventually. I was gonna suggest that you fix up the related leaks in the registration error paths as well, but since they are really distinct I just submitted a patch to fix those up separately instead (kfree was being just instead of put_device and the device was never deregistered on late probe errors). > Signed-off-by: Mika Westerberg > --- > drivers/nvmem/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c > index 8c830a80a648..112c8072e0f3 100644 > --- a/drivers/nvmem/core.c > +++ b/drivers/nvmem/core.c > @@ -528,7 +528,7 @@ int nvmem_unregister(struct nvmem_device *nvmem) > device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); > > nvmem_device_remove_all_cells(nvmem); > - device_del(&nvmem->dev); > + device_unregister(&nvmem->dev); Might be cleaner to use an explicit call to put_device() here since the driver currently does not use device_register(). > > return 0; > } Thanks, Johan