]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drivers, usb: convert ep_data.count from atomic_t to refcount_t
authorElena Reshetova <elena.reshetova@intel.com>
Mon, 6 Mar 2017 14:21:14 +0000 (16:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2017 04:32:59 +0000 (13:32 +0900)
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 <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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/legacy/inode.c

index db34b4dee0d9affbb8627c7895b8ea2308f68e3c..b9ca0a26cbd93e540a2df8f78544adb81e298805 100644 (file)
@@ -191,7 +191,7 @@ enum ep_state {
 struct ep_data {
        struct mutex                    lock;
        enum ep_state                   state;
-       atomic_t                        count;
+       refcount_t                      count;
        struct dev_data                 *dev;
        /* must hold dev->lock before accessing ep or req */
        struct usb_ep                   *ep;
@@ -206,12 +206,12 @@ struct ep_data {
 
 static inline void get_ep (struct ep_data *data)
 {
-       atomic_inc (&data->count);
+       refcount_inc (&data->count);
 }
 
 static void put_ep (struct ep_data *data)
 {
-       if (likely (!atomic_dec_and_test (&data->count)))
+       if (likely (!refcount_dec_and_test (&data->count)))
                return;
        put_dev (data->dev);
        /* needs no more cleanup */
@@ -1562,7 +1562,7 @@ static int activate_ep_files (struct dev_data *dev)
                init_waitqueue_head (&data->wait);
 
                strncpy (data->name, ep->name, sizeof (data->name) - 1);
-               atomic_set (&data->count, 1);
+               refcount_set (&data->count, 1);
                data->dev = dev;
                get_dev (dev);