Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp358837img; Wed, 20 Mar 2019 22:51:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJMRIW6XufiwObVpgtRjN3/ySlYOp7RoAC69s6zBWsrXnXSpuwMW19+Mg7x8xkrWsCWiyh X-Received: by 2002:a63:ff0c:: with SMTP id k12mr1745681pgi.358.1553147462462; Wed, 20 Mar 2019 22:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553147462; cv=none; d=google.com; s=arc-20160816; b=FAcKBhpFO1DIkegI0qFvDQ/LQ3OMgBbtWSaozACA5wUuG/jLIsyFWaro0XAofYJgQ4 TNB3Uk6nkvlN1u5Hj60BIauZgagqA77BXE3wIk4/bumZ5gw9JlM74kY3ruvGLfa8Za/b n8s/2t0oxNI9MnTT30u3cfv4PEIF2vsBNMGboeE4r6Aamikr/s20Z338D0ods58uqf0e 4DtQYLpfXT+XhxFl2WmCNcKMEsAYbZUFQeyTL+V3Aa+vxT2D/y8YKZhduGZtImYqYas5 qwD8mUNjorUhMvUJkETRx23cwMVnYP2usfiKAWkCiwVl/PwwsgzL/J13seQ8yXAZn9ct 3Udg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:organization:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=3dyJQXNBb2CUgnjsGm8wlzZGkGUJ6Bx0weT5SoMzZg8=; b=XCTcW1djW5tBTSlU4uHFfRO1H2vqeEE+CjhEGnFbsaV5UJV2OFfP+291i3zUq9FWhb ZCAJs4hPX/vCslH25o+4YDK9+9rsx0tKClUmUQT2kG//Q9Jlu50KNJVwUBFklgGhbWfs CIIErz9c+DK1m/xeRN9eBSHwQc7OqAe380kD5S4sQ8kZgOynt/8ej/iTQHk58/Rynocv z2wP+a4zyq1upAIbSo2IwJoUZOoBVgqJdwiLUWwCuvLWr7bVm86rarJAbPnb82x1ZvVh ucYnkiDi5JBT6pw4J4FqVSKHPjJxdoPnhiJ3ooKYOtYyL6ILgZb6ImOKpAzYqPHLzXw1 TJ0A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d16si3319163pgv.70.2019.03.20.22.50.35; Wed, 20 Mar 2019 22:51:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726369AbfCUFtj (ORCPT + 99 others); Thu, 21 Mar 2019 01:49:39 -0400 Received: from mga09.intel.com ([134.134.136.24]:35459 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725933AbfCUFtj (ORCPT ); Thu, 21 Mar 2019 01:49:39 -0400 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Mar 2019 22:49:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,251,1549958400"; d="scan'208";a="329243769" Received: from lahna.fi.intel.com (HELO lahna) ([10.237.72.157]) by fmsmga006.fm.intel.com with SMTP; 20 Mar 2019 22:49:34 -0700 Received: by lahna (sSMTP sendmail emulation); Thu, 21 Mar 2019 07:49:33 +0200 Date: Thu, 21 Mar 2019 07:49:33 +0200 From: Mika Westerberg To: Mukesh Ojha Cc: Aditya Pakki , kjlu@umn.edu, Andreas Noever , Michael Jamet , Yehezkel Bernat , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] thunderbolt: Fix to check return value of ida_simple_get Message-ID: <20190321054933.GC3622@lahna.fi.intel.com> References: <20190320162446.30500-1-pakki001@umn.edu> <20190320162924.GA3622@lahna.fi.intel.com> <78aa904a-6b98-9fb3-e2ca-b9994dc04869@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <78aa904a-6b98-9fb3-e2ca-b9994dc04869@codeaurora.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.11.3 (2019-02-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.