diff options
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 6 | ||||
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 4827e1fb8804..9e143c4bfe6a 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -1000,6 +1000,7 @@ struct rfkill * __must_check rfkill_alloc(const char *name, { struct rfkill *rfkill; struct device *dev; + size_t name_len; if (WARN_ON(!ops)) return NULL; @@ -1013,14 +1014,15 @@ struct rfkill * __must_check rfkill_alloc(const char *name, if (WARN_ON(type == RFKILL_TYPE_ALL || type >= NUM_RFKILL_TYPES)) return NULL; - rfkill = kzalloc(sizeof(*rfkill) + strlen(name) + 1, GFP_KERNEL); + name_len = strlen(name); + rfkill = kzalloc(sizeof(*rfkill) + name_len + 1, GFP_KERNEL); if (!rfkill) return NULL; spin_lock_init(&rfkill->lock); INIT_LIST_HEAD(&rfkill->node); rfkill->type = type; - strcpy(rfkill->name, name); + memcpy(rfkill->name, name, name_len); rfkill->ops = ops; rfkill->data = ops_data; diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index cf2dcec6ce5a..9c5b695dba7c 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -7,7 +7,6 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/mod_devicetable.h> #include <linux/rfkill.h> #include <linux/of.h> #include <linux/platform_device.h> |