lkml.org 
[lkml]   [2014]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v4 25/25] virtio-rng: refactor probe error handling
    Code like
    vi->vq = NULL;
    kfree(vi)
    does not make sense.

    Clean it up, use goto error labels for cleanup.

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    ---
    drivers/char/hw_random/virtio-rng.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
    index 132c9cc..72295ea 100644
    --- a/drivers/char/hw_random/virtio-rng.c
    +++ b/drivers/char/hw_random/virtio-rng.c
    @@ -109,8 +109,8 @@ static int probe_common(struct virtio_device *vdev)

    vi->index = index = ida_simple_get(&rng_index_ida, 0, 0, GFP_KERNEL);
    if (index < 0) {
    - kfree(vi);
    - return index;
    + err = index;
    + goto err_ida;
    }
    sprintf(vi->name, "virtio_rng.%d", index);
    init_completion(&vi->have_data);
    @@ -128,13 +128,16 @@ static int probe_common(struct virtio_device *vdev)
    vi->vq = virtio_find_single_vq(vdev, random_recv_done, "input");
    if (IS_ERR(vi->vq)) {
    err = PTR_ERR(vi->vq);
    - vi->vq = NULL;
    - kfree(vi);
    - ida_simple_remove(&rng_index_ida, index);
    - return err;
    + goto err_find;
    }

    return 0;
    +
    +err_find:
    + ida_simple_remove(&rng_index_ida, index);
    +err_ida:
    + kfree(vi);
    + return err;
    }

    static void remove_common(struct virtio_device *vdev)
    --
    MST



    \
     
     \ /
      Last update: 2014-10-13 10:22    [W:5.533 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site