All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cengiz Can <cengiz@kernel.wtf>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
	netdev@vger.kernel.org, Cengiz Can <cengiz@kernel.wtf>
Subject: [PATCH] tools: perf: add missing unlock to maps__insert error case
Date: Mon, 20 Jan 2020 17:15:54 +0300	[thread overview]
Message-ID: <20200120141553.23934-1-cengiz@kernel.wtf> (raw)

`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 <cengiz@kernel.wtf>
---

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


             reply	other threads:[~2020-01-20 14:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-20 14:15 Cengiz Can [this message]
2020-01-31  8:38 ` [PATCH] tools: perf: add missing unlock to maps__insert error case Arnaldo Carvalho de Melo
2020-01-31  8:43   ` Arnaldo Carvalho de Melo
2020-01-31 15:42     ` Cengiz Can
2020-02-05 15:45 ` [tip: perf/urgent] perf maps: Add missing unlock to maps__insert() " tip-bot2 for Cengiz Can

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200120141553.23934-1-cengiz@kernel.wtf \
    --to=cengiz@kernel.wtf \
    --cc=acme@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.