lkml.org 
[lkml]   [2013]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 055/153] pps: Fix a use-after free bug when unregistering a source.
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: George Spelvin <linux@horizon.com>

    commit d953e0e837e65ecc1ddaa4f9560f7925878a0de6 upstream.

    Remove the cdev from the system (with cdev_del) *before* deallocating it
    (in pps_device_destruct, called via kobject_put from device_destroy).

    Also prevent deallocating a device with open file handles.

    A better long-term fix is probably to remove the cdev from the pps_device
    entirely, and instead have all devices reference one global cdev. Then
    the deallocation ordering becomes simpler.

    But that's more complex and invasive change, so we leave that
    for later.

    Signed-off-by: George Spelvin <linux@horizon.com>
    Acked-by: Rodolfo Giometti <giometti@enneenne.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/pps/pps.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/drivers/pps/pps.c
    +++ b/drivers/pps/pps.c
    @@ -247,12 +247,15 @@ static int pps_cdev_open(struct inode *i
    struct pps_device *pps = container_of(inode->i_cdev,
    struct pps_device, cdev);
    file->private_data = pps;
    -
    + kobject_get(&pps->dev->kobj);
    return 0;
    }

    static int pps_cdev_release(struct inode *inode, struct file *file)
    {
    + struct pps_device *pps = container_of(inode->i_cdev,
    + struct pps_device, cdev);
    + kobject_put(&pps->dev->kobj);
    return 0;
    }

    @@ -274,8 +277,10 @@ static void pps_device_destruct(struct d
    {
    struct pps_device *pps = dev_get_drvdata(dev);

    - /* release id here to protect others from using it while it's
    - * still in use */
    + cdev_del(&pps->cdev);
    +
    + /* Now we can release the ID for re-use */
    + pr_debug("deallocating pps%d\n", pps->id);
    mutex_lock(&pps_idr_lock);
    idr_remove(&pps_idr, pps->id);
    mutex_unlock(&pps_idr_lock);
    @@ -330,6 +335,7 @@ int pps_register_cdev(struct pps_device
    if (IS_ERR(pps->dev))
    goto del_cdev;

    + /* Override the release function with our own */
    pps->dev->release = pps_device_destruct;

    pr_debug("source %s got cdev (%d:%d)\n", pps->info.name,
    @@ -350,9 +356,9 @@ free_idr:

    void pps_unregister_cdev(struct pps_device *pps)
    {
    + pr_debug("unregistering pps%d\n", pps->id);
    pps->lookup_cookie = NULL;
    device_destroy(pps_class, pps->dev->devt);
    - cdev_del(&pps->cdev);
    }

    /*



    \
     
     \ /
      Last update: 2013-03-04 05:41    [W:4.263 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site