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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D5984C072B1 for ; Thu, 30 May 2019 04:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE2E1252CE for ; Thu, 30 May 2019 04:19:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559189959; bh=oGMgnOnKZhEXrJDQyhTO2LVkP6kwGWwuTovV+BkBQls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2C2QyZQgA052V1JGg1daIkb3QLnnkIwjPESTxWE9/ZkvhUueQ1wL9cYitaBWOYfOX FSLOqoqC109t7cYF/O7FlqFFN0B4EO9iBW/6D53P6Teeifp/42yvr+B8bmU/KiDyZz C7frClq431Wdx0jIA86Y9lg1BX9Y653GydaVKfEo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730303AbfE3ETJ (ORCPT ); Thu, 30 May 2019 00:19:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:38650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730293AbfE3DP1 (ORCPT ); Wed, 29 May 2019 23:15:27 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 C2AE52457F; Thu, 30 May 2019 03:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186126; bh=oGMgnOnKZhEXrJDQyhTO2LVkP6kwGWwuTovV+BkBQls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ISY9bGtFGbWV8JYDfC5U97PJoJN10qqnAhsPDuppwlGASgdZH2aZrx9RROaOtZAiZ sVLtVFMTX1jgeK6gBdjcCQMs9Xtm+M7hABUoP20JUxs11NkuKcu9dGaL8XjfStNVrl RW9YEZAmhA2bkRJImzbFSo6H918b/uL+4+hEYy18= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Mika Westerberg , Sasha Levin Subject: [PATCH 5.0 286/346] thunderbolt: Fix to check return value of ida_simple_get Date: Wed, 29 May 2019 20:05:59 -0700 Message-Id: <20190530030555.397145883@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 9aabb68568b473bf2f0b179d053b403961e42e4d ] In enumerate_services, ida_simple_get on failure can return an error and leaks memory. The patch ensures that the dev_set_name is set on non failure cases, and releases memory during failure. Signed-off-by: Aditya Pakki Signed-off-by: Mika Westerberg Signed-off-by: Sasha Levin --- drivers/thunderbolt/xdomain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c index e27dd8beb94be..e0642dcb8b9bd 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; -- 2.20.1