lkml.org 
[lkml]   [2016]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 14/15] md-cluster: Less function calls in lockres_init() after error detection
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sat, 1 Oct 2016 16:01:05 +0200

    The kfree() function was called in up to three cases
    by the lockres_init() function during error handling even if
    the passed data structure member (or variable) contained a null pointer.

    Adjust jump targets according to the Linux coding style convention.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/md/md-cluster.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
    index 36bb962..0cade1a 100644
    --- a/drivers/md/md-cluster.c
    +++ b/drivers/md/md-cluster.c
    @@ -201,12 +201,12 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev,
    namelen = strlen(name);
    res->name = kzalloc(namelen + 1, GFP_KERNEL);
    if (!res->name)
    - goto out_err;
    + goto free_resource;
    strlcpy(res->name, name, namelen + 1);
    if (with_lvb) {
    res->lksb.sb_lvbptr = kzalloc(LVB_SIZE, GFP_KERNEL);
    if (!res->lksb.sb_lvbptr)
    - goto out_err;
    + goto free_name;
    res->flags = DLM_LKF_VALBLK;
    }

    @@ -218,15 +218,17 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev,
    ret = dlm_lock_sync(res, DLM_LOCK_NL);
    if (ret) {
    pr_err("md-cluster: Unable to lock NL on new lock resource %s\n", name);
    - goto out_err;
    + goto free_lvb;
    }
    res->flags &= ~DLM_LKF_EXPEDITE;
    res->flags |= DLM_LKF_CONVERT;

    return res;
    -out_err:
    +free_lvb:
    kfree(res->lksb.sb_lvbptr);
    +free_name:
    kfree(res->name);
    +free_resource:
    kfree(res);
    return NULL;
    }
    --
    2.10.0
    \
     
     \ /
      Last update: 2016-10-01 16:59    [W:4.019 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site