From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Elena Reshetova <elena.reshetova@intel.com>
Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
peterz@infradead.org, gregkh@linuxfoundation.org,
mingo@redhat.com, alexander.shishkin@linux.intel.com,
jolsa@kernel.org, mark.rutland@arm.com,
akpm@linux-foundation.org, matija.glavinic-pecotic.ext@nokia.com,
Hans Liljestrand <ishkamiel@gmail.com>,
Kees Cook <keescook@chromium.org>,
David Windsor <dwindsor@gmail.com>
Subject: Re: [PATCH 4/9] tools: convert dso.refcnt from atomic_t to refcount_t
Date: Wed, 22 Feb 2017 17:37:46 -0300 [thread overview]
Message-ID: <20170222203746.GF20447@kernel.org> (raw)
In-Reply-To: <1487691303-31858-5-git-send-email-elena.reshetova@intel.com>
Em Tue, Feb 21, 2017 at 05:34:58PM +0200, Elena Reshetova escreveu:
> 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.
Fixed by moving the include refcnt.h to later in the includes:
In file included from /home/acme/git/linux/tools/perf/util/dso.h:4:0,
from /home/acme/git/linux/tools/perf/util/machine.h:7,
from tests/thread-mg-share.c:2:
/home/acme/git/linux/tools/include/linux/refcount.h: In function ‘refcount_inc_not_zero’:
/home/acme/git/linux/tools/include/linux/refcount.h:95:23: error: ‘UINT_MAX’ undeclared (first use in this function)
REFCOUNT_WARN(new == UINT_MAX, "refcount_t: saturated; leaking memory.\n");
^
/home/acme/git/linux/tools/include/linux/refcount.h:47:41: note: in definition of macro ‘REFCOUNT_WARN’
#define REFCOUNT_WARN(cond, str) (void)(cond)
^~~~
/home/acme/git/linux/tools/include/linux/refcount.h:95:23: note: each undeclared identifier is reported only once for each function it appears in
REFCOUNT_WARN(new == UINT_MAX, "refcount_t: saturated; leaking memory.\n");
^
/home/acme/git/linux/tools/include/linux/refcount.h:47:41: note: in definition of macro ‘REFCOUNT_WARN’
#define REFCOUNT_WARN(cond, str) (void)(cond)
> Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
> Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: David Windsor <dwindsor@gmail.com>
> ---
> 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 3abe337..f88aa44 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 <linux/atomic.h>
> +#include <linux/refcount.h>
> #include <linux/types.h>
> #include <linux/rbtree.h>
> #include <sys/types.h>
> @@ -187,7 +187,7 @@ struct dso {
> void *priv;
> u64 db_id;
> };
> - atomic_t refcnt;
> + refcount_t refcnt;
> char name[0];
> };
>
> --
> 2.7.4
next prev parent reply other threads:[~2017-02-22 20:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 15:34 [PATCH 0/9] tools subsystem refcounter conversions Elena Reshetova
2017-02-21 15:34 ` [PATCH 1/9] tools: convert cgroup_sel.refcnt from atomic_t to refcount_t Elena Reshetova
2017-02-21 15:43 ` Arnaldo Carvalho de Melo
2017-02-22 14:29 ` Reshetova, Elena
2017-02-22 14:29 ` Reshetova, Elena
2017-02-22 15:37 ` Arnaldo Carvalho de Melo
2017-02-22 15:37 ` Arnaldo Carvalho de Melo
2017-02-22 16:10 ` Reshetova, Elena
2017-02-22 16:10 ` Reshetova, Elena
2017-02-22 20:28 ` Arnaldo Carvalho de Melo
2017-02-22 20:28 ` Arnaldo Carvalho de Melo
2017-02-23 13:10 ` Reshetova, Elena
2017-02-23 13:10 ` Reshetova, Elena
2017-03-07 7:36 ` [tip:perf/core] perf cgroup: Convert " tip-bot for Elena Reshetova
2017-02-21 15:34 ` [PATCH 2/9] tools: convert cpu_map.refcnt " Elena Reshetova
2017-02-22 20:29 ` Arnaldo Carvalho de Melo
2017-02-21 15:34 ` [PATCH 3/9] tools: convert comm_str.refcnt " Elena Reshetova
2017-02-22 20:33 ` Arnaldo Carvalho de Melo
2017-02-22 22:20 ` Arnaldo Carvalho de Melo
2017-02-22 22:31 ` Arnaldo Carvalho de Melo
2017-02-23 9:16 ` Reshetova, Elena
2017-02-23 9:16 ` Reshetova, Elena
2017-02-23 13:02 ` Arnaldo Carvalho de Melo
2017-02-21 15:34 ` [PATCH 4/9] tools: convert dso.refcnt " Elena Reshetova
2017-02-22 20:37 ` Arnaldo Carvalho de Melo [this message]
2017-02-22 20:40 ` Arnaldo Carvalho de Melo
2017-03-07 7:45 ` [tip:perf/core] perf dso: Convert " tip-bot for Elena Reshetova
2017-02-21 15:34 ` [PATCH 5/9] tools: convert map.refcnt " Elena Reshetova
2017-03-07 7:48 ` [tip:perf/core] perf map: Convert " tip-bot for Elena Reshetova
2017-02-21 15:35 ` [PATCH 6/9] tools: convert map_groups.refcnt " Elena Reshetova
2017-02-22 20:55 ` Arnaldo Carvalho de Melo
2017-02-21 15:35 ` [PATCH 7/9] tools: convert perf_map.refcnt " Elena Reshetova
2017-02-21 15:35 ` [PATCH 8/9] tools: convert thread.refcnt " Elena Reshetova
2017-02-22 23:06 ` Arnaldo Carvalho de Melo
2017-03-07 7:56 ` [tip:perf/core] perf thread: " tip-bot for Elena Reshetova
2017-02-21 15:35 ` [PATCH 9/9] tools: convert thread_map.refcnt " Elena Reshetova
2017-02-21 15:39 ` [PATCH 0/9] tools subsystem refcounter conversions Arnaldo Carvalho de Melo
2017-02-22 23:23 ` Arnaldo Carvalho de Melo
2017-02-22 23:29 ` Arnaldo Carvalho de Melo
2017-02-23 11:39 ` Reshetova, Elena
2017-02-23 11:39 ` Reshetova, Elena
2017-02-23 12:50 ` Arnaldo Carvalho de Melo
2017-02-23 12:50 ` Arnaldo Carvalho de Melo
2017-02-23 16:23 ` Arnaldo Carvalho de Melo
2017-02-23 16:23 ` Arnaldo Carvalho de Melo
2017-02-24 7:27 ` Reshetova, Elena
2017-02-24 7:27 ` Reshetova, Elena
2017-02-24 13:32 ` Arnaldo Carvalho de Melo
2017-02-24 13:32 ` Arnaldo Carvalho de Melo
2017-03-07 8:02 ` [tip:perf/core] perf evlist: Clarify a bit the use of perf_mmap->refcnt tip-bot for Arnaldo Carvalho de Melo
2017-02-21 15:46 ` [PATCH 0/9] tools subsystem refcounter conversions Peter Zijlstra
2017-02-21 16:00 ` Reshetova, Elena
2017-02-21 16:00 ` Reshetova, Elena
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=20170222203746.GF20447@kernel.org \
--to=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=dwindsor@gmail.com \
--cc=elena.reshetova@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=ishkamiel@gmail.com \
--cc=jolsa@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=matija.glavinic-pecotic.ext@nokia.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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.