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 15/15] kernel: convert kcov.refcount from atomic_t to refcount_t
Date: Mon, 17 Jul 2017 13:43:26 +0300 [thread overview]
Message-ID: <1500288206-12074-16-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/kcov.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/kcov.c b/kernel/kcov.c
index cd77199..a6c7df3 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -19,6 +19,7 @@
#include <linux/debugfs.h>
#include <linux/uaccess.h>
#include <linux/kcov.h>
+#include <linux/refcount.h>
#include <asm/setup.h>
/*
@@ -35,7 +36,7 @@ struct kcov {
* - opened file descriptor
* - task with enabled coverage (we can't unwire it from another task)
*/
- atomic_t refcount;
+ refcount_t refcount;
/* The lock protects mode, size, area and t. */
spinlock_t lock;
enum kcov_mode mode;
@@ -94,12 +95,12 @@ EXPORT_SYMBOL(__sanitizer_cov_trace_pc);
static void kcov_get(struct kcov *kcov)
{
- atomic_inc(&kcov->refcount);
+ refcount_inc(&kcov->refcount);
}
static void kcov_put(struct kcov *kcov)
{
- if (atomic_dec_and_test(&kcov->refcount)) {
+ if (refcount_dec_and_test(&kcov->refcount)) {
vfree(kcov->area);
kfree(kcov);
}
@@ -175,7 +176,7 @@ static int kcov_open(struct inode *inode, struct file *filep)
kcov = kzalloc(sizeof(*kcov), GFP_KERNEL);
if (!kcov)
return -ENOMEM;
- atomic_set(&kcov->refcount, 1);
+ refcount_set(&kcov->refcount, 1);
spin_lock_init(&kcov->lock);
filep->private_data = kcov;
return nonseekable_open(inode, filep);
--
2.7.4
next prev parent reply other threads:[~2017-07-17 10:46 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 ` [PATCH 09/15] kernel: convert uprobe.ref " Elena Reshetova
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 ` Elena Reshetova [this message]
-- 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 15/15] kernel: convert kcov.refcount 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-16-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).