From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755231AbdCGI7m (ORCPT ); Tue, 7 Mar 2017 03:59:42 -0500 Received: from terminus.zytor.com ([65.50.211.136]:34642 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754834AbdCGI7f (ORCPT ); Tue, 7 Mar 2017 03:59:35 -0500 Date: Mon, 6 Mar 2017 23:36:14 -0800 From: tip-bot for Elena Reshetova Message-ID: Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org, akpm@linux-foundation.org, gregkh@linuxfoundation.org, peterz@infradead.org, matija.glavinic-pecotic.ext@nokia.com, elena.reshetova@intel.com, mingo@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, keescook@chromium.org, hpa@zytor.com, dwindsor@gmail.com, acme@redhat.com, ishkamiel@gmail.com, tglx@linutronix.de Reply-To: acme@redhat.com, dwindsor@gmail.com, tglx@linutronix.de, ishkamiel@gmail.com, mark.rutland@arm.com, mingo@kernel.org, hpa@zytor.com, keescook@chromium.org, alexander.shishkin@linux.intel.com, peterz@infradead.org, akpm@linux-foundation.org, gregkh@linuxfoundation.org, elena.reshetova@intel.com, matija.glavinic-pecotic.ext@nokia.com, linux-kernel@vger.kernel.org, jolsa@kernel.org In-Reply-To: <1487691303-31858-2-git-send-email-elena.reshetova@intel.com> References: <1487691303-31858-2-git-send-email-elena.reshetova@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf cgroup: Convert cgroup_sel.refcnt from atomic_t to refcount_t Git-Commit-ID: 79c5fe6db8c70558d3a64959f55596d137ccc6e6 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: 79c5fe6db8c70558d3a64959f55596d137ccc6e6 Gitweb: http://git.kernel.org/tip/79c5fe6db8c70558d3a64959f55596d137ccc6e6 Author: Elena Reshetova AuthorDate: Tue, 21 Feb 2017 17:34:55 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 3 Mar 2017 19:07:14 -0300 perf cgroup: Convert cgroup_sel.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: alsa-devel@alsa-project.org 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 Link: http://lkml.kernel.org/r/1487691303-31858-2-git-send-email-elena.reshetova@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cgroup.c | 6 +++--- tools/perf/util/cgroup.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index eafbf114..86399ed 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -127,19 +127,19 @@ static int add_cgroup(struct perf_evlist *evlist, char *str) goto found; n++; } - if (atomic_read(&cgrp->refcnt) == 0) + if (refcount_read(&cgrp->refcnt) == 0) free(cgrp); return -1; found: - atomic_inc(&cgrp->refcnt); + refcount_inc(&cgrp->refcnt); counter->cgrp = cgrp; return 0; } void close_cgroup(struct cgroup_sel *cgrp) { - if (cgrp && atomic_dec_and_test(&cgrp->refcnt)) { + if (cgrp && refcount_dec_and_test(&cgrp->refcnt)) { close(cgrp->fd); zfree(&cgrp->name); free(cgrp); diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h index 31f8dcd..d91966b 100644 --- a/tools/perf/util/cgroup.h +++ b/tools/perf/util/cgroup.h @@ -1,14 +1,14 @@ #ifndef __CGROUP_H__ #define __CGROUP_H__ -#include +#include struct option; struct cgroup_sel { char *name; int fd; - atomic_t refcnt; + refcount_t refcnt; };