lkml.org 
[lkml]   [2016]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 057/128] rfkill: copy the name into the rfkill struct
    Date
    3.16.7-ckt23 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Johannes Berg <johannes.berg@intel.com>

    commit b7bb110008607a915298bf0f47d25886ecb94477 upstream.

    Some users of rfkill, like NFC and cfg80211, use a dynamic name when
    allocating rfkill, in those cases dev_name(). Therefore, the pointer
    passed to rfkill_alloc() might not be valid forever, I specifically
    found the case that the rfkill name was quite obviously an invalid
    pointer (or at least garbage) when the wiphy had been renamed.

    Fix this by making a copy of the rfkill name in rfkill_alloc().

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/rfkill/core.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/rfkill/core.c b/net/rfkill/core.c
    index b3b16c070a7f..5307a99c1838 100644
    --- a/net/rfkill/core.c
    +++ b/net/rfkill/core.c
    @@ -49,7 +49,6 @@
    struct rfkill {
    spinlock_t lock;

    - const char *name;
    enum rfkill_type type;

    unsigned long state;
    @@ -73,6 +72,7 @@ struct rfkill {
    struct delayed_work poll_work;
    struct work_struct uevent_work;
    struct work_struct sync_work;
    + char name[];
    };
    #define to_rfkill(d) container_of(d, struct rfkill, dev)

    @@ -862,14 +862,14 @@ 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), GFP_KERNEL);
    + rfkill = kzalloc(sizeof(*rfkill) + strlen(name) + 1, GFP_KERNEL);
    if (!rfkill)
    return NULL;

    spin_lock_init(&rfkill->lock);
    INIT_LIST_HEAD(&rfkill->node);
    rfkill->type = type;
    - rfkill->name = name;
    + strcpy(rfkill->name, name);
    rfkill->ops = ops;
    rfkill->data = ops_data;

    \
     
     \ /
      Last update: 2016-01-25 00:21    [W:4.137 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site