From: Julia Lawall <julia@diku.dk>
To: Jan Beulich <JBeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Ian Campbell <ian.campbell@citrix.com>,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/4] drivers/block/xen-blkback/blkback.c: take size of pointed value, not pointer
Date: Fri, 16 Sep 2011 10:08:37 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.64.1109161008210.8543@pc-004.diku.dk> (raw)
In-Reply-To: <4E7319010200007800056727@nat28.tlf.novell.com>
> I think a better fix for this is to use kzalloc() properly here:
Indeed, it seems like a much better idea :)
julia
> Subject: xen-blkback: use kzalloc() in favor of kmalloc()+memset()
>
> This fixes the problem of three of those four memset()-s having
> improper size arguments passed: Sizeof a pointer-typed expression
> returns the size of the pointer, not that of the pointed to data.
>
> It also reverts using kmalloc() instead of kzalloc() for the allocation
> of the pending grant handles array, as that array gets fully
> initialized in a subsequent loop.
>
> Reported-by: Julia Lawall <julia@diku.dk>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>
> ---
> drivers/block/xen-blkback/blkback.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> --- 3.1-rc6/drivers/block/xen-blkback/blkback.c
> +++ 3.1-rc6-xen-blkback-kzalloc/drivers/block/xen-blkback/blkback.c
> @@ -765,9 +765,9 @@ static int __init xen_blkif_init(void)
>
> mmap_pages = xen_blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST;
>
> - blkbk->pending_reqs = kmalloc(sizeof(blkbk->pending_reqs[0]) *
> + blkbk->pending_reqs = kzalloc(sizeof(blkbk->pending_reqs[0]) *
> xen_blkif_reqs, GFP_KERNEL);
> - blkbk->pending_grant_handles = kzalloc(sizeof(blkbk->pending_grant_handles[0]) *
> + blkbk->pending_grant_handles = kmalloc(sizeof(blkbk->pending_grant_handles[0]) *
> mmap_pages, GFP_KERNEL);
> blkbk->pending_pages = kzalloc(sizeof(blkbk->pending_pages[0]) *
> mmap_pages, GFP_KERNEL);
> @@ -790,8 +790,6 @@ static int __init xen_blkif_init(void)
> if (rc)
> goto failed_init;
>
> - memset(blkbk->pending_reqs, 0, sizeof(blkbk->pending_reqs));
> -
> INIT_LIST_HEAD(&blkbk->pending_free);
> spin_lock_init(&blkbk->pending_free_lock);
> init_waitqueue_head(&blkbk->pending_free_wq);
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
prev parent reply other threads:[~2011-09-16 8:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-16 6:57 Julia Lawall
2011-09-16 7:38 ` Jan Beulich
2011-09-16 8:08 ` Julia Lawall [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1109161008210.8543@pc-004.diku.dk \
--to=julia@diku.dk \
--cc=JBeulich@suse.com \
--cc=ian.campbell@citrix.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®