From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Elder Subject: Re: [PATCH 01/15] rbd: use kstrndup() in rbd_header_from_disk() Date: Wed, 15 Feb 2017 09:52:14 -0600 Message-ID: References: <1487103124-2974-1-git-send-email-idryomov@gmail.com> <1487103124-2974-2-git-send-email-idryomov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-it0-f49.google.com ([209.85.214.49]:35503 "EHLO mail-it0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbdBOPwR (ORCPT ); Wed, 15 Feb 2017 10:52:17 -0500 Received: by mail-it0-f49.google.com with SMTP id 203so67080516ith.0 for ; Wed, 15 Feb 2017 07:52:16 -0800 (PST) In-Reply-To: <1487103124-2974-2-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Ilya Dryomov , ceph-devel@vger.kernel.org On 02/14/2017 02:11 PM, Ilya Dryomov wrote: > Signed-off-by: Ilya Dryomov Looks good. Reviewed-by: Alex Elder > --- > drivers/block/rbd.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 40a15ae354ce..76e538c3378e 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -992,15 +992,11 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, > /* Allocate this now to avoid having to handle failure below */ > > if (first_time) { > - size_t len; > - > - len = strnlen(ondisk->object_prefix, > - sizeof (ondisk->object_prefix)); > - object_prefix = kmalloc(len + 1, GFP_KERNEL); > + object_prefix = kstrndup(ondisk->object_prefix, > + sizeof(ondisk->object_prefix), > + GFP_KERNEL); > if (!object_prefix) > return -ENOMEM; > - memcpy(object_prefix, ondisk->object_prefix, len); > - object_prefix[len] = '\0'; > } > > /* Allocate the snapshot context and fill it in */ >