fs, nfs: convert nfs_cache_defer_req.count from atomic_t to refcount_t

atomic_t variables are currently used to implement reference
counters with the following properties:
 - counter is initialized to 1 using atomic_set()
 - a resource is freed upon counter reaching zero
 - once counter reaches zero, its further
   increments aren't allowed
 - counter schema uses basic atomic operations
   (set, inc, inc_not_zero, dec_and_test, etc.)

Such atomic variables should be converted to a newly provided
refcount_t type and API that prevents accidental counter overflows
and underflows. This is important since overflows and underflows
can lead to use-after-free situation and be exploitable.

The variable nfs_cache_defer_req.count is used as pure reference counter.
Convert it to refcount_t and fix up the operations.

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>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index 2ae676f93e6bd5e3823358bcd3b988ce074adc75..6167f13025d75454063fb7e217ac8f4aeec911c7 100644 (file)
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c
@@ -66,7 +66,7 @@ int nfs_cache_upcall(struct cache_detail *cd, char *entry_name)
  */
 void nfs_cache_defer_req_put(struct nfs_cache_defer_req *dreq)
 {
-       if (atomic_dec_and_test(&dreq->count))
+       if (refcount_dec_and_test(&dreq->count))
                kfree(dreq);
 }
 
@@ -86,7 +86,7 @@ static struct cache_deferred_req *nfs_dns_cache_defer(struct cache_req *req)
 
        dreq = container_of(req, struct nfs_cache_defer_req, req);
        dreq->deferred_req.revisit = nfs_dns_cache_revisit;
-       atomic_inc(&dreq->count);
+       refcount_inc(&dreq->count);
 
        return &dreq->deferred_req;
 }
@@ -98,7 +98,7 @@ struct nfs_cache_defer_req *nfs_cache_defer_req_alloc(void)
        dreq = kzalloc(sizeof(*dreq), GFP_KERNEL);
        if (dreq) {
                init_completion(&dreq->completion);
-               atomic_set(&dreq->count, 1);
+               refcount_set(&dreq->count, 1);
                dreq->req.defer = nfs_dns_cache_defer;
        }
        return dreq;

diff --git a/fs/nfs/cache_lib.h b/fs/nfs/cache_lib.h
index 4116d2c3f52f130ca887d55682f1a8a24ba878cb..02b378c2eeefa6f8b3ad5fcd29feb7ec9f5fb537 100644 (file)
--- a/fs/nfs/cache_lib.h
+++ b/fs/nfs/cache_lib.h
@@ -15,7 +15,7 @@ struct nfs_cache_defer_req {
        struct cache_req req;
        struct cache_deferred_req deferred_req;
        struct completion completion;
-       atomic_t count;
+       refcount_t count;
 };
 
 extern int nfs_cache_upcall(struct cache_detail *cd, char *entry_name);