Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp723554img; Wed, 20 Mar 2019 09:30:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqww76NkbcRGYqog9NW9k9DEugdEahydcPC7yYiXtZ84RCBD2Aeiom2em0JjrdzVSJGMssT6 X-Received: by 2002:aa7:8c8c:: with SMTP id p12mr9045378pfd.0.1553099426090; Wed, 20 Mar 2019 09:30:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553099426; cv=none; d=google.com; s=arc-20160816; b=OMpEOrBFQxNgItJy40LAQh4tOyozjXUlY6QeUjD2z+VnC7lt7/TlV1HpMg+ydFJaVD qtes3sVf50tQ7KoDXYJAN1PioOXFTTFoQF5FuVNPnTNV9YURQ7Sw02z8/yb3Vyut/A6Y 45Nh/FsdxUL3PJp6lkvQ83vfNXnJSIDmCUZJ2GJ6LluwAQUgnSlfNVHwCtMjEzUyEcS8 s0FQo4LbZtAySH8+YPF5UUnq9eLpoLVOwFmwqdOeJ5XNvqfsWMHHpezmrqnRBoD7+hp6 i1zAbHTF3RgqNTE6bub0/QtKL0/qOaFs5MlW0FzwdjB1iy+flfittCs04UPWI+XpKck8 jg0g== 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-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=dSUQE+Ydwiw/hauc7wKbk430Yv3uLkyrTL6KXrakab0=; b=nUJ8G6AHESIdIYdu0to2MuGgHFn3PGBXPil4Ij+6ErVqAe50eZk3BFoVQcUna+/IST ZeKs7ReS0w1FHGFYFTRqbyhFer1Bb1NuA8OaaOzqiwXIdzbDWlV/SxB0/SV2aY/CseBZ vfQWyPqSTxF4tgZR9/MJ5piap4XEn5uj9HFy5NiQZ1NSRnHksAx/N2NBt98HHpz70cQJ 3vw8VHqM4vnIXeSKn0vkZUl6VcXzCb6qqgoFouFqvl9xnl57C1gFRwpBOKHZF0FrJqjl tKZibwp+IVYgM5c5fcBLHhS8/hkdpUqtj2v/hCFcKWTyY8cfdhkibyn3vGkDg9kyP3LO huhw== 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 h64si2043637pfd.74.2019.03.20.09.30.09; Wed, 20 Mar 2019 09:30:26 -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 S1727234AbfCTQ3a (ORCPT + 99 others); Wed, 20 Mar 2019 12:29:30 -0400 Received: from mga17.intel.com ([192.55.52.151]:34115 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726295AbfCTQ3a (ORCPT ); Wed, 20 Mar 2019 12:29:30 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Mar 2019 09:29:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,249,1549958400"; d="scan'208";a="135716631" Received: from lahna.fi.intel.com (HELO lahna) ([10.237.72.157]) by orsmga003.jf.intel.com with SMTP; 20 Mar 2019 09:29:25 -0700 Received: by lahna (sSMTP sendmail emulation); Wed, 20 Mar 2019 18:29:24 +0200 Date: Wed, 20 Mar 2019 18:29:24 +0200 From: Mika Westerberg To: Aditya Pakki Cc: 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: <20190320162924.GA3622@lahna.fi.intel.com> References: <20190320162446.30500-1-pakki001@umn.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190320162446.30500-1-pakki001@umn.edu> 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 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.