Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2617762ybl; Mon, 20 Jan 2020 06:20:21 -0800 (PST) X-Google-Smtp-Source: APXvYqzj0HpLJIhMrwIU1pSbN9hX6p4lROVt284/JzDC6tPEkozO0L3nqotZX+mYqBExHNgU9IcR X-Received: by 2002:a9d:7ac9:: with SMTP id m9mr15520800otn.80.1579530021515; Mon, 20 Jan 2020 06:20:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579530021; cv=none; d=google.com; s=arc-20160816; b=N7zywkJ0hzvzs6knzow0IPqkX00Rcmz37PgpObvjfcHaZDj/4tHwL8774Row06iVxJ 3FjrQ2QFhgLAQKRXIuNbUlAkKNfa1v6AGYt7XSDRLYStDPbCFka+4rWealaNUxeLCK18 ZjX+5W2v2ntHPRl9VqLidwwB4i7n4gkY/keJ2X8/+h2dV2r3W40HDa5aEQRkqdLMJJ+4 RI87mCCA8CjD1Y7y2wf2X3L1uudbCYThqL78SYXsjEZDyKKDo9g3yG3vNJYSHuy3gJZB MAAvjbEDOmO7ODDs3O7tZVkECmIhGTD9UBAyxAq8gze4CAvcOEJ4Vtw1A2mhJ477klp0 GMLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=DXO2ESCfy+oZ/8OP/8llJtbxcJzu7ZwVS32DSck2W9I=; b=de5D3CdwXEDTnDYqRh6jqpWCWPJ334AwXwWRHVLrMVWpRyNiRWvhYU7jsd98mWLwap 4V0lD5KbD5qo+Q17BnjstnT/jB99qXCqzVHK8+RNUxKbqVGrL5IeuDtEBxTYbEemPUAN fOWgQTrHV2mTljaR5n2VF2X0JhObH46dQf51c6R/jE8PS07s7FzNNd5BPT3mVa7XAfBX nKM9wRpiN7R3IXIj6tS0FTD76ajKx+mYxomBCn4Mmwau4fS0e5b81ipoDuOINcmP4kP4 NFIohZVd/OfI+98zj9XssdismUrbQX5AciD+LqmvkBYFNLYHe+fAQN4JA7FYUMFGtz9o 2ZWw== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w4si18774621otq.144.2020.01.20.06.20.08; Mon, 20 Jan 2020 06:20:21 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727531AbgATOTC (ORCPT + 99 others); Mon, 20 Jan 2020 09:19:02 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:37269 "EHLO relay6-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726819AbgATOTC (ORCPT ); Mon, 20 Jan 2020 09:19:02 -0500 X-Originating-IP: 84.44.14.226 Received: from nexussix.ar.arcelik (unknown [84.44.14.226]) (Authenticated sender: cengiz@kernel.wtf) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id B2ED4C000E; Mon, 20 Jan 2020 14:18:57 +0000 (UTC) From: Cengiz Can To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, Cengiz Can Subject: [PATCH] tools: perf: add missing unlock to maps__insert error case Date: Mon, 20 Jan 2020 17:15:54 +0300 Message-Id: <20200120141553.23934-1-cengiz@kernel.wtf> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org `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. Signed-off-by: Cengiz Can --- Hello Arnaldo, I'm not exactly sure about the order that we must call up_write here. Please tell me if the `__maps__free_maps_by_name` frees the `rw_semaphore`. If that's the case, should we change the order to unlock and free? Thanks! tools/perf/util/map.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index fdd5bddb3075..f67960bedebb 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -549,6 +549,7 @@ void maps__insert(struct maps *maps, struct map *map) if (maps_by_name == NULL) { __maps__free_maps_by_name(maps); + up_write(&maps->lock); return; } -- 2.25.0