From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754881AbdCGIAB (ORCPT ); Tue, 7 Mar 2017 03:00:01 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33166 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbdCGH7s (ORCPT ); Tue, 7 Mar 2017 02:59:48 -0500 Date: Mon, 6 Mar 2017 23:45:16 -0800 From: tip-bot for Elena Reshetova Message-ID: Cc: keescook@chromium.org, dwindsor@gmail.com, acme@redhat.com, akpm@linux-foundation.org, gregkh@linuxfoundation.org, tglx@linutronix.de, matija.glavinic-pecotic.ext@nokia.com, ishkamiel@gmail.com, jolsa@kernel.org, elena.reshetova@intel.com, hpa@zytor.com, alexander.shishkin@linux.intel.com, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, mark.rutland@arm.com Reply-To: tglx@linutronix.de, gregkh@linuxfoundation.org, matija.glavinic-pecotic.ext@nokia.com, ishkamiel@gmail.com, akpm@linux-foundation.org, acme@redhat.com, dwindsor@gmail.com, keescook@chromium.org, mark.rutland@arm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, elena.reshetova@intel.com, jolsa@kernel.org In-Reply-To: <1487691303-31858-5-git-send-email-elena.reshetova@intel.com> References: <1487691303-31858-5-git-send-email-elena.reshetova@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf dso: Convert dso.refcnt from atomic_t to refcount_t Git-Commit-ID: 7100810a75b9854f1b05550b54500497c5914d4b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7100810a75b9854f1b05550b54500497c5914d4b Gitweb: http://git.kernel.org/tip/7100810a75b9854f1b05550b54500497c5914d4b Author: Elena Reshetova AuthorDate: Tue, 21 Feb 2017 17:34:58 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 3 Mar 2017 19:07:15 -0300 perf dso: Convert dso.refcnt from atomic_t to refcount_t The refcount_t type and corresponding API should be used instead of atomic_t when the variable is used as a reference counter. This allows to avoid accidental refcounter overflows that might lead to use-after-free situations. Signed-off-by: Elena Reshetova Signed-off-by: David Windsor Signed-off-by: Hans Liljestrand Signed-off-by: Kees Kook Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Andrew Morton Cc: David Windsor Cc: Greg Kroah-Hartman Cc: Hans Liljestrand Cc: Jiri Olsa Cc: Kees Kook Cc: Mark Rutland Cc: Matija Glavinic Pecotic Cc: Peter Zijlstra Cc: alsa-devel@alsa-project.org Link: http://lkml.kernel.org/r/1487691303-31858-5-git-send-email-elena.reshetova@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 6 +++--- tools/perf/util/dso.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index d38b62a..42db00d 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1109,7 +1109,7 @@ struct dso *dso__new(const char *name) INIT_LIST_HEAD(&dso->node); INIT_LIST_HEAD(&dso->data.open_entry); pthread_mutex_init(&dso->lock, NULL); - atomic_set(&dso->refcnt, 1); + refcount_set(&dso->refcnt, 1); } return dso; @@ -1147,13 +1147,13 @@ void dso__delete(struct dso *dso) struct dso *dso__get(struct dso *dso) { if (dso) - atomic_inc(&dso->refcnt); + refcount_inc(&dso->refcnt); return dso; } void dso__put(struct dso *dso) { - if (dso && atomic_dec_and_test(&dso->refcnt)) + if (dso && refcount_dec_and_test(&dso->refcnt)) dso__delete(dso); } diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index ecc4bbd..12350b1 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -1,7 +1,7 @@ #ifndef __PERF_DSO #define __PERF_DSO -#include +#include #include #include #include @@ -187,7 +187,7 @@ struct dso { void *priv; u64 db_id; }; - atomic_t refcnt; + refcount_t refcnt; char name[0]; };