From: Elena Reshetova <elena.reshetova@intel.com>
To: linux-kernel@vger.kernel.org
Cc: cgroups@vger.kernel.org, linux-audit@redhat.com,
linux-fsdevel@vger.kernel.org, peterz@infradead.org,
gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk,
tj@kernel.org, mingo@redhat.com, hannes@cmpxchg.org,
lizefan@huawei.com, acme@kernel.org,
alexander.shishkin@linux.intel.com, eparis@redhat.com,
akpm@linux-foundation.org, arnd@arndb.de, luto@kernel.org,
keescook@chromium.org, tglx@linutronix.de,
Elena Reshetova <elena.reshetova@intel.com>
Subject: [PATCH 09/15] kernel: convert uprobe.ref from atomic_t to refcount_t
Date: Mon, 17 Jul 2017 13:43:20 +0300 [thread overview]
Message-ID: <1500288206-12074-10-git-send-email-elena.reshetova@intel.com> (raw)
In-Reply-To: <1500288206-12074-1-git-send-email-elena.reshetova@intel.com>
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.
Suggested-by: Kees Cook <keescook@chromium.org>
Reviewed-by: David Windsor <dwindsor@gmail.com>
Reviewed-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
---
kernel/events/uprobes.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 456596d..ca093957 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -66,7 +66,7 @@ static struct percpu_rw_semaphore dup_mmap_sem;
struct uprobe {
struct rb_node rb_node; /* node in the rb tree */
- atomic_t ref;
+ refcount_t ref;
struct rw_semaphore register_rwsem;
struct rw_semaphore consumer_rwsem;
struct list_head pending_list;
@@ -371,13 +371,13 @@ set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long v
static struct uprobe *get_uprobe(struct uprobe *uprobe)
{
- atomic_inc(&uprobe->ref);
+ refcount_inc(&uprobe->ref);
return uprobe;
}
static void put_uprobe(struct uprobe *uprobe)
{
- if (atomic_dec_and_test(&uprobe->ref))
+ if (refcount_dec_and_test(&uprobe->ref))
kfree(uprobe);
}
@@ -459,7 +459,7 @@ static struct uprobe *__insert_uprobe(struct uprobe *uprobe)
rb_link_node(&uprobe->rb_node, parent, p);
rb_insert_color(&uprobe->rb_node, &uprobes_tree);
/* get access + creation ref */
- atomic_set(&uprobe->ref, 2);
+ refcount_set(&uprobe->ref, 2);
return u;
}
--
2.7.4
next prev parent reply other threads:[~2017-07-17 10:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-17 10:43 [PATCH 00/15] v3 kernel core pieces refcount conversions Elena Reshetova
2017-07-17 10:43 ` [PATCH 01/15] kernel: convert sighand_struct.count from atomic_t to refcount_t Elena Reshetova
2017-07-17 10:43 ` [PATCH 02/15] kernel: convert signal_struct.sigcnt " Elena Reshetova
2017-07-17 10:43 ` [PATCH 03/15] kernel: convert user_struct.__count " Elena Reshetova
2017-07-17 10:43 ` [PATCH 04/15] kernel: convert task_struct.usage " Elena Reshetova
2017-07-17 10:43 ` [PATCH 05/15] kernel: convert task_struct.stack_refcount " Elena Reshetova
2017-07-17 10:43 ` [PATCH 06/15] kernel: convert perf_event_context.refcount " Elena Reshetova
2017-07-17 10:43 ` [PATCH 07/15] kernel: convert ring_buffer.refcount " Elena Reshetova
2017-07-17 10:43 ` [PATCH 08/15] kernel: convert ring_buffer.aux_refcount " Elena Reshetova
2017-07-17 10:43 ` Elena Reshetova [this message]
2017-07-17 10:43 ` [PATCH 10/15] kernel: convert nsproxy.count " Elena Reshetova
2017-07-17 10:43 ` [PATCH 11/15] kernel: convert group_info.usage " Elena Reshetova
2017-07-17 10:43 ` [PATCH 12/15] kernel: convert cred.usage " Elena Reshetova
2017-07-17 10:43 ` [PATCH 13/15] sched: convert numa_group.refcount " Elena Reshetova
2017-07-17 10:43 ` [PATCH 14/15] kernel: convert futex_pi_state.refcount " Elena Reshetova
2017-07-17 14:25 ` Thomas Gleixner
2017-07-17 16:51 ` Reshetova, Elena
2017-07-17 17:57 ` Thomas Gleixner
2017-07-18 9:39 ` Reshetova, Elena
2017-07-17 10:43 ` [PATCH 15/15] kernel: convert kcov.refcount " Elena Reshetova
-- strict thread matches above, loose matches on Subject: below --
2017-07-07 9:04 [PATCH 00/15] v2 kernel core refcount conversions Elena Reshetova
2017-07-07 9:04 ` [PATCH 09/15] kernel: convert uprobe.ref from atomic_t to refcount_t Elena Reshetova
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=1500288206-12074-10-git-send-email-elena.reshetova@intel.com \
--to=elena.reshetova@intel.com \
--cc=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=arnd@arndb.de \
--cc=cgroups@vger.kernel.org \
--cc=eparis@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hannes@cmpxchg.org \
--cc=keescook@chromium.org \
--cc=linux-audit@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).