From patchwork Tue Mar 3 17:43:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 229896 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=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 5CC5AC3F2C6 for ; Tue, 3 Mar 2020 18:10:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F4382073B for ; Tue, 3 Mar 2020 18:10:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583259028; bh=3v3FPTsDVsy/CU2qctd5vstqr4cMjD4cLFEwgWTJDjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XVRFl3WQDjGGUpz2KxAOSM95NyxWrr4p8wKC9sRV+aWTT6b1NHMTIZT9S9JP8WggH sCRBiYeFit7h3WqFtGnI/u2y6qIMgnL8AwKDDq8N1lFUUQVAR4gknejqNJ9z/Vlhea LjUVz1oP8XjrO0xFgUGtECNA3BnokRIpnpi+OPnI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731347AbgCCRvB (ORCPT ); Tue, 3 Mar 2020 12:51:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:58902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731631AbgCCRu6 (ORCPT ); Tue, 3 Mar 2020 12:50:58 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 AD7B020728; Tue, 3 Mar 2020 17:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257858; bh=3v3FPTsDVsy/CU2qctd5vstqr4cMjD4cLFEwgWTJDjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GCEd1hBX6uq05+YglXc9oX7OMUqfTYvGrr3Q2L5RnB6BZAtK7NpvfRRwg0gnKBQ/D Y8fDQ6xNUK0TJmGqxPf2uHSS6L984FW/x142lZwaa0BRqFN40UoUD83CZEdlEvty3h 8AQxyxMmHFNJ9mtya9ooGqFTzpqx9vKu3ucI63dQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cengiz Can , Adrian Hunter , Jiri Olsa , Namhyung Kim , Arnaldo Carvalho de Melo Subject: [PATCH 5.5 155/176] perf maps: Add missing unlock to maps__insert() error case Date: Tue, 3 Mar 2020 18:43:39 +0100 Message-Id: <20200303174322.429303788@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Cengiz Can commit 85fc95d75970ee7dd8e01904e7fb1197c275ba6b upstream. `tools/perf/util/map.c` has a function named `maps__insert` that acquires a write lock if its in multithread context. Even though this lock is released when function successfully completes, there's a branch that is executed when `maps_by_name == NULL` that returns from this function without releasing the write lock. Added an `up_write` to release the lock when this happens. Fixes: a7c2b572e217 ("perf map_groups: Auto sort maps by name, if needed") Signed-off-by: Cengiz Can Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lore.kernel.org/lkml/20200120141553.23934-1-cengiz@kernel.wtf Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/map.c | 1 + 1 file changed, 1 insertion(+) --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -549,6 +549,7 @@ void maps__insert(struct maps *maps, str if (maps_by_name == NULL) { __maps__free_maps_by_name(maps); + up_write(&maps->lock); return; }