mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
e99e88a9d2
This converts all remaining cases of the old setup_timer() API into using timer_setup(), where the callback argument is the structure already holding the struct timer_list. These should have no behavioral changes, since they just change which pointer is passed into the callback with the same available pointers after conversion. It handles the following examples, in addition to some other variations. Casting from unsigned long: void my_callback(unsigned long data) { struct something *ptr = (struct something *)data; ... } ... setup_timer(&ptr->my_timer, my_callback, ptr); and forced object casts: void my_callback(struct something *ptr) { ... } ... setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr); become: void my_callback(struct timer_list *t) { struct something *ptr = from_timer(ptr, t, my_timer); ... } ... timer_setup(&ptr->my_timer, my_callback, 0); Direct function assignments: void my_callback(unsigned long data) { struct something *ptr = (struct something *)data; ... } ... ptr->my_timer.function = my_callback; have a temporary cast added, along with converting the args: void my_callback(struct timer_list *t) { struct something *ptr = from_timer(ptr, t, my_timer); ... } ... ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback; And finally, callbacks without a data assignment: void my_callback(unsigned long data) { ... } ... setup_timer(&ptr->my_timer, my_callback, 0); have their argument renamed to verify they're unused during conversion: void my_callback(struct timer_list *unused) { ... } ... timer_setup(&ptr->my_timer, my_callback, 0); The conversion is done with the following Coccinelle script: spatch --very-quiet --all-includes --include-headers \ -I ./arch/x86/include -I ./arch/x86/include/generated \ -I ./include -I ./arch/x86/include/uapi \ -I ./arch/x86/include/generated/uapi -I ./include/uapi \ -I ./include/generated/uapi --include ./include/linux/kconfig.h \ --dir . \ --cocci-file ~/src/data/timer_setup.cocci @fix_address_of@ expression e; @@ setup_timer( -&(e) +&e , ...) // Update any raw setup_timer() usages that have a NULL callback, but // would otherwise match change_timer_function_usage, since the latter // will update all function assignments done in the face of a NULL // function initialization in setup_timer(). @change_timer_function_usage_NULL@ expression _E; identifier _timer; type _cast_data; @@ ( -setup_timer(&_E->_timer, NULL, _E); +timer_setup(&_E->_timer, NULL, 0); | -setup_timer(&_E->_timer, NULL, (_cast_data)_E); +timer_setup(&_E->_timer, NULL, 0); | -setup_timer(&_E._timer, NULL, &_E); +timer_setup(&_E._timer, NULL, 0); | -setup_timer(&_E._timer, NULL, (_cast_data)&_E); +timer_setup(&_E._timer, NULL, 0); ) @change_timer_function_usage@ expression _E; identifier _timer; struct timer_list _stl; identifier _callback; type _cast_func, _cast_data; @@ ( -setup_timer(&_E->_timer, _callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, &_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, &_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)&_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E._timer, _callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, &_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, &_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | _E->_timer@_stl.function = _callback; | _E->_timer@_stl.function = &_callback; | _E->_timer@_stl.function = (_cast_func)_callback; | _E->_timer@_stl.function = (_cast_func)&_callback; | _E._timer@_stl.function = _callback; | _E._timer@_stl.function = &_callback; | _E._timer@_stl.function = (_cast_func)_callback; | _E._timer@_stl.function = (_cast_func)&_callback; ) // callback(unsigned long arg) @change_callback_handle_cast depends on change_timer_function_usage@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; identifier _handle; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { ( ... when != _origarg _handletype *_handle = -(_handletype *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle = -(void *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(_handletype *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(void *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg ) } // callback(unsigned long arg) without existing variable @change_callback_handle_cast_no_arg depends on change_timer_function_usage && !change_callback_handle_cast@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { + _handletype *_origarg = from_timer(_origarg, t, _timer); + ... when != _origarg - (_handletype *)_origarg + _origarg ... when != _origarg } // Avoid already converted callbacks. @match_callback_converted depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier t; @@ void _callback(struct timer_list *t) { ... } // callback(struct something *handle) @change_callback_handle_arg depends on change_timer_function_usage && !match_callback_converted && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; @@ void _callback( -_handletype *_handle +struct timer_list *t ) { + _handletype *_handle = from_timer(_handle, t, _timer); ... } // If change_callback_handle_arg ran on an empty function, remove // the added handler. @unchange_callback_handle_arg depends on change_timer_function_usage && change_callback_handle_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; identifier t; @@ void _callback(struct timer_list *t) { - _handletype *_handle = from_timer(_handle, t, _timer); } // We only want to refactor the setup_timer() data argument if we've found // the matching callback. This undoes changes in change_timer_function_usage. @unchange_timer_function_usage depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg && !change_callback_handle_arg@ expression change_timer_function_usage._E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type change_timer_function_usage._cast_data; @@ ( -timer_setup(&_E->_timer, _callback, 0); +setup_timer(&_E->_timer, _callback, (_cast_data)_E); | -timer_setup(&_E._timer, _callback, 0); +setup_timer(&_E._timer, _callback, (_cast_data)&_E); ) // If we fixed a callback from a .function assignment, fix the // assignment cast now. @change_timer_function_assignment depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression change_timer_function_usage._E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_func; typedef TIMER_FUNC_TYPE; @@ ( _E->_timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -&_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -(_cast_func)_callback; +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -&_callback; +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -(_cast_func)_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; ) // Sometimes timer functions are called directly. Replace matched args. @change_timer_function_calls depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression _E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_data; @@ _callback( ( -(_cast_data)_E +&_E->_timer | -(_cast_data)&_E +&_E._timer | -_E +&_E->_timer ) ) // If a timer has been configured without a data argument, it can be // converted without regard to the callback argument, since it is unused. @match_timer_function_unused_data@ expression _E; identifier _timer; identifier _callback; @@ ( -setup_timer(&_E->_timer, _callback, 0); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, 0L); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, 0UL); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0L); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0UL); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_timer, _callback, 0); +timer_setup(&_timer, _callback, 0); | -setup_timer(&_timer, _callback, 0L); +timer_setup(&_timer, _callback, 0); | -setup_timer(&_timer, _callback, 0UL); +timer_setup(&_timer, _callback, 0); | -setup_timer(_timer, _callback, 0); +timer_setup(_timer, _callback, 0); | -setup_timer(_timer, _callback, 0L); +timer_setup(_timer, _callback, 0); | -setup_timer(_timer, _callback, 0UL); +timer_setup(_timer, _callback, 0); ) @change_callback_unused_data depends on match_timer_function_unused_data@ identifier match_timer_function_unused_data._callback; type _origtype; identifier _origarg; @@ void _callback( -_origtype _origarg +struct timer_list *unused ) { ... when != _origarg } Signed-off-by: Kees Cook <keescook@chromium.org>
259 lines
6.6 KiB
C
259 lines
6.6 KiB
C
/*
|
|
* lib80211 -- common bits for IEEE802.11 drivers
|
|
*
|
|
* Copyright(c) 2008 John W. Linville <linville@tuxdriver.com>
|
|
*
|
|
* Portions copied from old ieee80211 component, w/ original copyright
|
|
* notices below:
|
|
*
|
|
* Host AP crypto routines
|
|
*
|
|
* Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
|
|
* Portions Copyright (C) 2004, Intel Corporation <jketreno@linux.intel.com>
|
|
*
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/ieee80211.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <net/lib80211.h>
|
|
|
|
#define DRV_NAME "lib80211"
|
|
|
|
#define DRV_DESCRIPTION "common routines for IEEE802.11 drivers"
|
|
|
|
MODULE_DESCRIPTION(DRV_DESCRIPTION);
|
|
MODULE_AUTHOR("John W. Linville <linville@tuxdriver.com>");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
struct lib80211_crypto_alg {
|
|
struct list_head list;
|
|
struct lib80211_crypto_ops *ops;
|
|
};
|
|
|
|
static LIST_HEAD(lib80211_crypto_algs);
|
|
static DEFINE_SPINLOCK(lib80211_crypto_lock);
|
|
|
|
static void lib80211_crypt_deinit_entries(struct lib80211_crypt_info *info,
|
|
int force);
|
|
static void lib80211_crypt_quiescing(struct lib80211_crypt_info *info);
|
|
static void lib80211_crypt_deinit_handler(struct timer_list *t);
|
|
|
|
int lib80211_crypt_info_init(struct lib80211_crypt_info *info, char *name,
|
|
spinlock_t *lock)
|
|
{
|
|
memset(info, 0, sizeof(*info));
|
|
|
|
info->name = name;
|
|
info->lock = lock;
|
|
|
|
INIT_LIST_HEAD(&info->crypt_deinit_list);
|
|
timer_setup(&info->crypt_deinit_timer, lib80211_crypt_deinit_handler,
|
|
0);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(lib80211_crypt_info_init);
|
|
|
|
void lib80211_crypt_info_free(struct lib80211_crypt_info *info)
|
|
{
|
|
int i;
|
|
|
|
lib80211_crypt_quiescing(info);
|
|
del_timer_sync(&info->crypt_deinit_timer);
|
|
lib80211_crypt_deinit_entries(info, 1);
|
|
|
|
for (i = 0; i < NUM_WEP_KEYS; i++) {
|
|
struct lib80211_crypt_data *crypt = info->crypt[i];
|
|
if (crypt) {
|
|
if (crypt->ops) {
|
|
crypt->ops->deinit(crypt->priv);
|
|
module_put(crypt->ops->owner);
|
|
}
|
|
kfree(crypt);
|
|
info->crypt[i] = NULL;
|
|
}
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(lib80211_crypt_info_free);
|
|
|
|
static void lib80211_crypt_deinit_entries(struct lib80211_crypt_info *info,
|
|
int force)
|
|
{
|
|
struct lib80211_crypt_data *entry, *next;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(info->lock, flags);
|
|
list_for_each_entry_safe(entry, next, &info->crypt_deinit_list, list) {
|
|
if (atomic_read(&entry->refcnt) != 0 && !force)
|
|
continue;
|
|
|
|
list_del(&entry->list);
|
|
|
|
if (entry->ops) {
|
|
entry->ops->deinit(entry->priv);
|
|
module_put(entry->ops->owner);
|
|
}
|
|
kfree(entry);
|
|
}
|
|
spin_unlock_irqrestore(info->lock, flags);
|
|
}
|
|
|
|
/* After this, crypt_deinit_list won't accept new members */
|
|
static void lib80211_crypt_quiescing(struct lib80211_crypt_info *info)
|
|
{
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(info->lock, flags);
|
|
info->crypt_quiesced = 1;
|
|
spin_unlock_irqrestore(info->lock, flags);
|
|
}
|
|
|
|
static void lib80211_crypt_deinit_handler(struct timer_list *t)
|
|
{
|
|
struct lib80211_crypt_info *info = from_timer(info, t,
|
|
crypt_deinit_timer);
|
|
unsigned long flags;
|
|
|
|
lib80211_crypt_deinit_entries(info, 0);
|
|
|
|
spin_lock_irqsave(info->lock, flags);
|
|
if (!list_empty(&info->crypt_deinit_list) && !info->crypt_quiesced) {
|
|
printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
|
|
"deletion list\n", info->name);
|
|
info->crypt_deinit_timer.expires = jiffies + HZ;
|
|
add_timer(&info->crypt_deinit_timer);
|
|
}
|
|
spin_unlock_irqrestore(info->lock, flags);
|
|
}
|
|
|
|
void lib80211_crypt_delayed_deinit(struct lib80211_crypt_info *info,
|
|
struct lib80211_crypt_data **crypt)
|
|
{
|
|
struct lib80211_crypt_data *tmp;
|
|
unsigned long flags;
|
|
|
|
if (*crypt == NULL)
|
|
return;
|
|
|
|
tmp = *crypt;
|
|
*crypt = NULL;
|
|
|
|
/* must not run ops->deinit() while there may be pending encrypt or
|
|
* decrypt operations. Use a list of delayed deinits to avoid needing
|
|
* locking. */
|
|
|
|
spin_lock_irqsave(info->lock, flags);
|
|
if (!info->crypt_quiesced) {
|
|
list_add(&tmp->list, &info->crypt_deinit_list);
|
|
if (!timer_pending(&info->crypt_deinit_timer)) {
|
|
info->crypt_deinit_timer.expires = jiffies + HZ;
|
|
add_timer(&info->crypt_deinit_timer);
|
|
}
|
|
}
|
|
spin_unlock_irqrestore(info->lock, flags);
|
|
}
|
|
EXPORT_SYMBOL(lib80211_crypt_delayed_deinit);
|
|
|
|
int lib80211_register_crypto_ops(struct lib80211_crypto_ops *ops)
|
|
{
|
|
unsigned long flags;
|
|
struct lib80211_crypto_alg *alg;
|
|
|
|
alg = kzalloc(sizeof(*alg), GFP_KERNEL);
|
|
if (alg == NULL)
|
|
return -ENOMEM;
|
|
|
|
alg->ops = ops;
|
|
|
|
spin_lock_irqsave(&lib80211_crypto_lock, flags);
|
|
list_add(&alg->list, &lib80211_crypto_algs);
|
|
spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
|
|
|
|
printk(KERN_DEBUG "lib80211_crypt: registered algorithm '%s'\n",
|
|
ops->name);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(lib80211_register_crypto_ops);
|
|
|
|
int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops)
|
|
{
|
|
struct lib80211_crypto_alg *alg;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&lib80211_crypto_lock, flags);
|
|
list_for_each_entry(alg, &lib80211_crypto_algs, list) {
|
|
if (alg->ops == ops)
|
|
goto found;
|
|
}
|
|
spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
|
|
return -EINVAL;
|
|
|
|
found:
|
|
printk(KERN_DEBUG "lib80211_crypt: unregistered algorithm '%s'\n",
|
|
ops->name);
|
|
list_del(&alg->list);
|
|
spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
|
|
kfree(alg);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(lib80211_unregister_crypto_ops);
|
|
|
|
struct lib80211_crypto_ops *lib80211_get_crypto_ops(const char *name)
|
|
{
|
|
struct lib80211_crypto_alg *alg;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&lib80211_crypto_lock, flags);
|
|
list_for_each_entry(alg, &lib80211_crypto_algs, list) {
|
|
if (strcmp(alg->ops->name, name) == 0)
|
|
goto found;
|
|
}
|
|
spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
|
|
return NULL;
|
|
|
|
found:
|
|
spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
|
|
return alg->ops;
|
|
}
|
|
EXPORT_SYMBOL(lib80211_get_crypto_ops);
|
|
|
|
static void *lib80211_crypt_null_init(int keyidx)
|
|
{
|
|
return (void *)1;
|
|
}
|
|
|
|
static void lib80211_crypt_null_deinit(void *priv)
|
|
{
|
|
}
|
|
|
|
static struct lib80211_crypto_ops lib80211_crypt_null = {
|
|
.name = "NULL",
|
|
.init = lib80211_crypt_null_init,
|
|
.deinit = lib80211_crypt_null_deinit,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static int __init lib80211_init(void)
|
|
{
|
|
pr_info(DRV_DESCRIPTION "\n");
|
|
return lib80211_register_crypto_ops(&lib80211_crypt_null);
|
|
}
|
|
|
|
static void __exit lib80211_exit(void)
|
|
{
|
|
lib80211_unregister_crypto_ops(&lib80211_crypt_null);
|
|
BUG_ON(!list_empty(&lib80211_crypto_algs));
|
|
}
|
|
|
|
module_init(lib80211_init);
|
|
module_exit(lib80211_exit);
|