lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 469/717] block/rnbd-clt: Get rid of warning regarding size argument in strlcpy
    Date
    From: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>

    [ Upstream commit e7508d48565060af5d89f10cb83c9359c8ae1310 ]

    The kernel test robot triggerred the following warning,

    >> drivers/block/rnbd/rnbd-clt.c:1397:42: warning: size argument in
    'strlcpy' call appears to be size of the source; expected the size of the
    destination [-Wstrlcpy-strlcat-size]
    strlcpy(dev->pathname, pathname, strlen(pathname) + 1);
    ~~~~~~~^~~~~~~~~~~~~

    To get rid of the above warning, use a kstrdup as Bart suggested.

    Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>
    Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/block/rnbd/rnbd-clt.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
    index f180ebf1e11c9..7af1b60582fe5 100644
    --- a/drivers/block/rnbd/rnbd-clt.c
    +++ b/drivers/block/rnbd/rnbd-clt.c
    @@ -1383,12 +1383,11 @@ static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess,
    goto out_queues;
    }

    - dev->pathname = kzalloc(strlen(pathname) + 1, GFP_KERNEL);
    + dev->pathname = kstrdup(pathname, GFP_KERNEL);
    if (!dev->pathname) {
    ret = -ENOMEM;
    goto out_queues;
    }
    - strlcpy(dev->pathname, pathname, strlen(pathname) + 1);

    dev->clt_device_id = ret;
    dev->sess = sess;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:3.242 / U:0.720 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site