提交 552aa585 编写于 作者: E Elena Reshetova 提交者: Kalle Valo

hostap: convert hostap_cmd_queue.usecnt from atomic_t to refcount_t

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: NElena Reshetova <elena.reshetova@intel.com>
Signed-off-by: NHans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: NKees Cook <keescook@chromium.org>
Signed-off-by: NDavid Windsor <dwindsor@gmail.com>
Signed-off-by: NKalle Valo <kvalo@codeaurora.org>
上级 9029679f
...@@ -190,7 +190,7 @@ static inline void __hostap_cmd_queue_free(local_info_t *local, ...@@ -190,7 +190,7 @@ static inline void __hostap_cmd_queue_free(local_info_t *local,
} }
} }
if (atomic_dec_and_test(&entry->usecnt) && entry->del_req) if (refcount_dec_and_test(&entry->usecnt) && entry->del_req)
kfree(entry); kfree(entry);
} }
...@@ -228,7 +228,7 @@ static void prism2_clear_cmd_queue(local_info_t *local) ...@@ -228,7 +228,7 @@ static void prism2_clear_cmd_queue(local_info_t *local)
spin_lock_irqsave(&local->cmdlock, flags); spin_lock_irqsave(&local->cmdlock, flags);
list_for_each_safe(ptr, n, &local->cmd_queue) { list_for_each_safe(ptr, n, &local->cmd_queue) {
entry = list_entry(ptr, struct hostap_cmd_queue, list); entry = list_entry(ptr, struct hostap_cmd_queue, list);
atomic_inc(&entry->usecnt); refcount_inc(&entry->usecnt);
printk(KERN_DEBUG "%s: removed pending cmd_queue entry " printk(KERN_DEBUG "%s: removed pending cmd_queue entry "
"(type=%d, cmd=0x%04x, param0=0x%04x)\n", "(type=%d, cmd=0x%04x, param0=0x%04x)\n",
local->dev->name, entry->type, entry->cmd, local->dev->name, entry->type, entry->cmd,
...@@ -350,7 +350,7 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0, ...@@ -350,7 +350,7 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
if (entry == NULL) if (entry == NULL)
return -ENOMEM; return -ENOMEM;
atomic_set(&entry->usecnt, 1); refcount_set(&entry->usecnt, 1);
entry->type = CMD_SLEEP; entry->type = CMD_SLEEP;
entry->cmd = cmd; entry->cmd = cmd;
entry->param0 = param0; entry->param0 = param0;
...@@ -516,7 +516,7 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0, ...@@ -516,7 +516,7 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
if (entry == NULL) if (entry == NULL)
return -ENOMEM; return -ENOMEM;
atomic_set(&entry->usecnt, 1); refcount_set(&entry->usecnt, 1);
entry->type = CMD_CALLBACK; entry->type = CMD_CALLBACK;
entry->cmd = cmd; entry->cmd = cmd;
entry->param0 = param0; entry->param0 = param0;
...@@ -666,7 +666,7 @@ static void prism2_cmd_ev(struct net_device *dev) ...@@ -666,7 +666,7 @@ static void prism2_cmd_ev(struct net_device *dev)
if (!list_empty(&local->cmd_queue)) { if (!list_empty(&local->cmd_queue)) {
entry = list_entry(local->cmd_queue.next, entry = list_entry(local->cmd_queue.next,
struct hostap_cmd_queue, list); struct hostap_cmd_queue, list);
atomic_inc(&entry->usecnt); refcount_inc(&entry->usecnt);
list_del_init(&entry->list); list_del_init(&entry->list);
local->cmd_queue_len--; local->cmd_queue_len--;
...@@ -718,7 +718,7 @@ static void prism2_cmd_ev(struct net_device *dev) ...@@ -718,7 +718,7 @@ static void prism2_cmd_ev(struct net_device *dev)
entry = NULL; entry = NULL;
} }
if (entry) if (entry)
atomic_inc(&entry->usecnt); refcount_inc(&entry->usecnt);
} }
spin_unlock(&local->cmdlock); spin_unlock(&local->cmdlock);
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/refcount.h>
#include <net/iw_handler.h> #include <net/iw_handler.h>
#include <net/ieee80211_radiotap.h> #include <net/ieee80211_radiotap.h>
#include <net/lib80211.h> #include <net/lib80211.h>
...@@ -557,7 +558,7 @@ struct hostap_cmd_queue { ...@@ -557,7 +558,7 @@ struct hostap_cmd_queue {
u16 resp0, res; u16 resp0, res;
volatile int issued, issuing; volatile int issued, issuing;
atomic_t usecnt; refcount_t usecnt;
int del_req; int del_req;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册