From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 697F4C43381 for ; Fri, 22 Mar 2019 07:32:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33F07218B0 for ; Fri, 22 Mar 2019 07:32:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Qt7Zbt0V"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="F/P0GG/H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727668AbfCVHcA (ORCPT ); Fri, 22 Mar 2019 03:32:00 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52582 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727606AbfCVHb4 (ORCPT ); Fri, 22 Mar 2019 03:31:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3E22B60FEA; Fri, 22 Mar 2019 07:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553239915; bh=flyEN9uqybGJqrospEgZQpSwcy66+azhMRtsSqfA2q0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=Qt7Zbt0VJuw3WItH6l3AXobSLq829dWUQL5U6nX28HduESKhyAKrDG3XupuqbMZKn 9CcnI92PE+LKwX55BDLzU2USvjjGhk8oPsy8COCWUkOORS0MJnuYeLkXYpoZ55C12J DBIRDftWo+EX6HFlnhr32/EFfiF1zwjVznPRlxRA= Received: from [10.204.79.83] (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mojha@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 22EB0606FC; Fri, 22 Mar 2019 07:31:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553239912; bh=flyEN9uqybGJqrospEgZQpSwcy66+azhMRtsSqfA2q0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=F/P0GG/HNB6SLDfykU3gToH7A+Xq6Y4GBDtLcGv08M3cguHfcOEsaXz8IH/+3/dsW jfXjoQL0JmcN2jJA6zjrucFETby4i8YazlfBU1MQoH+FkMSthte2jmmnKscdv7+cJR mDKN6F5bVFlEnDG/m52XDCu97kkaTSzVldfgrDAU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 22EB0606FC Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=mojha@codeaurora.org Subject: Re: [PATCH v2] thunderbolt: Fix to check return value of ida_simple_get To: Mika Westerberg Cc: Aditya Pakki , kjlu@umn.edu, Andreas Noever , Michael Jamet , Yehezkel Bernat , linux-kernel@vger.kernel.org References: <20190320162446.30500-1-pakki001@umn.edu> <20190320162924.GA3622@lahna.fi.intel.com> <78aa904a-6b98-9fb3-e2ca-b9994dc04869@codeaurora.org> <20190321054933.GC3622@lahna.fi.intel.com> From: Mukesh Ojha Message-ID: <56b4f022-c235-8dbf-0bce-cf4c9372d1cd@codeaurora.org> Date: Fri, 22 Mar 2019 13:01:44 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190321054933.GC3622@lahna.fi.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/21/2019 11:19 AM, Mika Westerberg wrote: > On Thu, Mar 21, 2019 at 02:09:41AM +0530, Mukesh Ojha wrote: >> On 3/20/2019 9:59 PM, Mika Westerberg wrote: >>> On Wed, Mar 20, 2019 at 11:24:45AM -0500, Aditya Pakki wrote: >>>> In enumerate_services, ida_simple_get on failure can return an error and >>>> leaks memory during device_register failure. The patch ensures that >>>> the dev_set_name is set on non failure cases, and releases memory in >>>> case of failure. >>>> >>>> Signed-off-by: Aditya Pakki >>>> >>>> --- >>>> v1: Missed cleanup of svc in case of allocation failure and >>>> device_register failure. >>>> --- >>>> drivers/thunderbolt/xdomain.c | 9 ++++++++- >>>> 1 file changed, 8 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c >>>> index e27dd8beb94b..eb08275185bf 100644 >>>> --- a/drivers/thunderbolt/xdomain.c >>>> +++ b/drivers/thunderbolt/xdomain.c >>>> @@ -740,6 +740,7 @@ static void enumerate_services(struct tb_xdomain *xd) >>>> struct tb_service *svc; >>>> struct tb_property *p; >>>> struct device *dev; >>>> + int id; >>>> /* >>>> * First remove all services that are not available anymore in >>>> @@ -768,7 +769,12 @@ static void enumerate_services(struct tb_xdomain *xd) >>>> break; >>>> } >>>> - svc->id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL); >>>> + id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL); >>>> + if (id < 0) { >>>> + kfree(svc); >>>> + break; >>>> + } >>>> + svc->id = id; >>>> svc->dev.bus = &tb_bus_type; >>>> svc->dev.type = &tb_service_type; >>>> svc->dev.parent = &xd->dev; >>>> @@ -776,6 +782,7 @@ static void enumerate_services(struct tb_xdomain *xd) >>>> if (device_register(&svc->dev)) { >>>> put_device(&svc->dev); >>>> + kfree(svc); >>> You can't do this after device_register() is called. The put_device() >>> above is sufficient. >> >> If  device_register fails, how would svc gets freed? we need  to kfree svc >> here as well. > Please read the comment on top of device_register(). It should explain. > > So no kfree here. Thanks for pointer Mika. Overlooked the fact that dev is a data member of svc not a pointer, also noticed there are many places in tree where , it is not followed. Thanks, Mukesh