Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1944858ima; Thu, 25 Oct 2018 07:22:58 -0700 (PDT) X-Google-Smtp-Source: AJdET5fbYr2Bdgpdji+FPIkEe0RLbYElH0nnJONoCwR51qLzi12ksar8kVmUOYt70K7WBmPTvCEr X-Received: by 2002:a17:902:1129:: with SMTP id d38-v6mr1740447pla.270.1540477377999; Thu, 25 Oct 2018 07:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477377; cv=none; d=google.com; s=arc-20160816; b=a6wFxF2x2oGHdcVZkOm8xRxFiOL8e8lAQoDLIm2if3iDZLxGPcCN6pvRoDu5LdqWgZ 2ar9kcq29qDnI3soXrL6gd+nsvkY0iNn2MAnyKLg6q0BywMQgDOK8PT8s/VF9TYPbImu R8EE6/bJMRbPQbOkCu9yAzJWFTigTd5kZlklbXx7cPtON3DOw/DZ7qZa4PQusCtCpTzR IYh7XFQAcOuNth+89dmAf9pyUOph0PICgQjitWWCN1dT+A/o9Wv+NLgMULoqr5LAeUcb 1ZhYHdJZcFEUDcxDSb/UVcBpcGbh8sXN3/WT30YK6927hRz86hcKTKdQs6OnE+u4ojG7 B0+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=w3vQFjW7lJs4755QMVVDLG81IPPuOICK+s7NR5chUDg=; b=UZ2rs4iyRkp6TTkuJ1Fmuyj61y7R3eVXrr3dajGJZFTKws5qL3RSPOCiZFEjJR+YbL qwDFYomLBSpDdg4V9TaZWxdSubleHiEV99M6spAgs1YToEDwPOOoa0Iipu5oy1bv/b9A NQjIEL1JBUYLXg5TBX+NdKw3SsmUoPt9zdzjCS87hz7zTupogcCtBFcePZMsB2BDBqg2 g1VSdzbrZB/BI2TaZk0zJgOPrQRY59g60v6JYG9QhoHLLlKTsQjyS5gYAOi1Edxd4/lK l24MhZdSo5XebeD4/8gl7/G70wOxjcNawAwnOUaapOzsfkk52G7JXVIj3Ef1bIqqWeSw tJ+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jjHWNr1C; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 34-v6si7995580pgy.249.2018.10.25.07.22.10; Thu, 25 Oct 2018 07:22:57 -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; dkim=pass header.i=@kernel.org header.s=default header.b=jjHWNr1C; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730832AbeJYWxA (ORCPT + 99 others); Thu, 25 Oct 2018 18:53:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:35310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730693AbeJYWw7 (ORCPT ); Thu, 25 Oct 2018 18:52:59 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 31DA12085B; Thu, 25 Oct 2018 14:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540477201; bh=G4t2AF3onUlzYRhTSSW/W1jYUpRZNbDH8ypZpvOLpzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jjHWNr1CvPtog9I+cITlFRbqCcfIYOlt4DysUY6IIiT9obdQmj3bZtqEdxIALQ2gY x1Y02Ie60iEa+Q9XWmG5v44/86GEwlH79Odw4muGKPzEAT0AfOfmkNbdSbAczOjOzp ttHRrvPGKcZIOfTuOMiQpT6kFwkX/PERygKgIdfQ= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Namhyung Kim , David Ahern , Ingo Molnar , Jiri Olsa , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 3.18 45/98] perf machine: Fix __machine__findnew_thread() error path Date: Thu, 25 Oct 2018 10:18:00 -0400 Message-Id: <20181025141853.214051-45-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141853.214051-1-sashal@kernel.org> References: <20181025141853.214051-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Namhyung Kim [ Upstream commit 260d819e3abdbdaa2b88fb983d1314f1b263f9e2 ] When thread__init_map_groups() fails, a new thread should be removed from the rbtree since it's gonna be freed. Also update last match cache only if the function succeeded. Reported-by: David Ahern Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: David Ahern Cc: Ingo Molnar Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1420763892-15535-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/machine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 34fc7c8672e4..84238a10c34b 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -389,7 +389,6 @@ static struct thread *__machine__findnew_thread(struct machine *machine, if (th != NULL) { rb_link_node(&th->rb_node, parent, p); rb_insert_color(&th->rb_node, &machine->threads); - machine->last_match = th; /* * We have to initialize map_groups separately @@ -400,9 +399,12 @@ static struct thread *__machine__findnew_thread(struct machine *machine, * leader and that would screwed the rb tree. */ if (thread__init_map_groups(th, machine)) { + rb_erase(&th->rb_node, &machine->threads); thread__delete(th); return NULL; } + + machine->last_match = th; } return th; -- 2.17.1