* [PATCH] xen-blkfront: Use kcalloc instead of kzalloc to allocate array
@ 2011-11-29 21:08 Thomas Meyer
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Meyer @ 2011-11-29 21:08 UTC (permalink / raw)
To: xen-devel, virtualization, linux-kernel
The advantage of kcalloc is, that will prevent integer overflows which could
result from the multiplication of number of elements and size and it is also
a bit nicer to read.
The semantic patch that makes this change is available
in https://lkml.org/lkml/2011/11/25/107
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
---
diff -u -p a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
--- a/drivers/block/cciss_scsi.c 2011-11-28 19:36:47.343430551 +0100
+++ b/drivers/block/cciss_scsi.c 2011-11-28 19:49:24.922716381 +0100
@@ -534,10 +534,10 @@ adjust_cciss_scsi_table(ctlr_info_t *h,
int nadded, nremoved;
struct Scsi_Host *sh = NULL;
- added = kzalloc(sizeof(*added) * CCISS_MAX_SCSI_DEVS_PER_HBA,
- GFP_KERNEL);
- removed = kzalloc(sizeof(*removed) * CCISS_MAX_SCSI_DEVS_PER_HBA,
+ added = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA, sizeof(*added),
GFP_KERNEL);
+ removed = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA, sizeof(*removed),
+ GFP_KERNEL);
if (!added || !removed) {
dev_warn(&h->pdev->dev,
@@ -1191,8 +1191,8 @@ cciss_update_non_disk_devices(ctlr_info_
ld_buff = kzalloc(reportlunsize, GFP_KERNEL);
inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);
- currentsd = kzalloc(sizeof(*currentsd) *
- (CCISS_MAX_SCSI_DEVS_PER_HBA+1), GFP_KERNEL);
+ currentsd = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA + 1,
+ sizeof(*currentsd), GFP_KERNEL);
if (ld_buff == NULL || inq_buff == NULL || currentsd == NULL) {
printk(KERN_ERR "cciss: out of memory\n");
goto out;
diff -u -p a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
--- a/drivers/block/xen-blkfront.c 2011-11-13 11:07:22.680095573 +0100
+++ b/drivers/block/xen-blkfront.c 2011-11-28 19:49:29.109460410 +0100
@@ -156,7 +156,7 @@ static int xlbd_reserve_minors(unsigned
if (end > nr_minors) {
unsigned long *bitmap, *old;
- bitmap = kzalloc(BITS_TO_LONGS(end) * sizeof(*bitmap),
+ bitmap = kcalloc(BITS_TO_LONGS(end), sizeof(*bitmap),
GFP_KERNEL);
if (bitmap == NULL)
return -ENOMEM;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xen-blkfront: Use kcalloc instead of kzalloc to allocate array
[not found] <1322600880.1534.293.camel@localhost.localdomain>
@ 2011-12-06 3:27 ` Konrad Rzeszutek Wilk
2011-12-14 18:56 ` Konrad Rzeszutek Wilk
1 sibling, 0 replies; 3+ messages in thread
From: Konrad Rzeszutek Wilk @ 2011-12-06 3:27 UTC (permalink / raw)
To: Thomas Meyer; +Cc: xen-devel, linux-kernel, virtualization
On Tue, Nov 29, 2011 at 10:08:00PM +0100, Thomas Meyer wrote:
> The advantage of kcalloc is, that will prevent integer overflows which could
> result from the multiplication of number of elements and size and it is also
> a bit nicer to read.
>
> The semantic patch that makes this change is available
> in https://lkml.org/lkml/2011/11/25/107
>
> Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
> ---
>
> diff -u -p a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
> --- a/drivers/block/cciss_scsi.c 2011-11-28 19:36:47.343430551 +0100
> +++ b/drivers/block/cciss_scsi.c 2011-11-28 19:49:24.922716381 +0100
> @@ -534,10 +534,10 @@ adjust_cciss_scsi_table(ctlr_info_t *h,
> int nadded, nremoved;
> struct Scsi_Host *sh = NULL;
>
> - added = kzalloc(sizeof(*added) * CCISS_MAX_SCSI_DEVS_PER_HBA,
> - GFP_KERNEL);
> - removed = kzalloc(sizeof(*removed) * CCISS_MAX_SCSI_DEVS_PER_HBA,
> + added = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA, sizeof(*added),
> GFP_KERNEL);
> + removed = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA, sizeof(*removed),
> + GFP_KERNEL);
>
It looks like you mixed two patches together.
> if (!added || !removed) {
> dev_warn(&h->pdev->dev,
> @@ -1191,8 +1191,8 @@ cciss_update_non_disk_devices(ctlr_info_
>
> ld_buff = kzalloc(reportlunsize, GFP_KERNEL);
> inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);
> - currentsd = kzalloc(sizeof(*currentsd) *
> - (CCISS_MAX_SCSI_DEVS_PER_HBA+1), GFP_KERNEL);
> + currentsd = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA + 1,
> + sizeof(*currentsd), GFP_KERNEL);
> if (ld_buff == NULL || inq_buff == NULL || currentsd == NULL) {
> printk(KERN_ERR "cciss: out of memory\n");
> goto out;
> diff -u -p a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> --- a/drivers/block/xen-blkfront.c 2011-11-13 11:07:22.680095573 +0100
> +++ b/drivers/block/xen-blkfront.c 2011-11-28 19:49:29.109460410 +0100
> @@ -156,7 +156,7 @@ static int xlbd_reserve_minors(unsigned
> if (end > nr_minors) {
> unsigned long *bitmap, *old;
>
> - bitmap = kzalloc(BITS_TO_LONGS(end) * sizeof(*bitmap),
> + bitmap = kcalloc(BITS_TO_LONGS(end), sizeof(*bitmap),
> GFP_KERNEL);
But this parts looks good.
Can you respin it with just that part please?
> if (bitmap == NULL)
> return -ENOMEM;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xen-blkfront: Use kcalloc instead of kzalloc to allocate array
[not found] <1322600880.1534.293.camel@localhost.localdomain>
2011-12-06 3:27 ` [PATCH] xen-blkfront: Use kcalloc instead of kzalloc to allocate array Konrad Rzeszutek Wilk
@ 2011-12-14 18:56 ` Konrad Rzeszutek Wilk
1 sibling, 0 replies; 3+ messages in thread
From: Konrad Rzeszutek Wilk @ 2011-12-14 18:56 UTC (permalink / raw)
To: Thomas Meyer; +Cc: xen-devel, linux-kernel, virtualization
On Tue, Nov 29, 2011 at 10:08:00PM +0100, Thomas Meyer wrote:
> The advantage of kcalloc is, that will prevent integer overflows which could
> result from the multiplication of number of elements and size and it is also
> a bit nicer to read.
>
> The semantic patch that makes this change is available
> in https://lkml.org/lkml/2011/11/25/107
>
Thomas,
I put the xen-blkfront part of the patch in my tree and dropped the cciss_scsi one.
> Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
> ---
>
> diff -u -p a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
> --- a/drivers/block/cciss_scsi.c 2011-11-28 19:36:47.343430551 +0100
> +++ b/drivers/block/cciss_scsi.c 2011-11-28 19:49:24.922716381 +0100
> @@ -534,10 +534,10 @@ adjust_cciss_scsi_table(ctlr_info_t *h,
> int nadded, nremoved;
> struct Scsi_Host *sh = NULL;
>
> - added = kzalloc(sizeof(*added) * CCISS_MAX_SCSI_DEVS_PER_HBA,
> - GFP_KERNEL);
> - removed = kzalloc(sizeof(*removed) * CCISS_MAX_SCSI_DEVS_PER_HBA,
> + added = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA, sizeof(*added),
> GFP_KERNEL);
> + removed = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA, sizeof(*removed),
> + GFP_KERNEL);
>
> if (!added || !removed) {
> dev_warn(&h->pdev->dev,
> @@ -1191,8 +1191,8 @@ cciss_update_non_disk_devices(ctlr_info_
>
> ld_buff = kzalloc(reportlunsize, GFP_KERNEL);
> inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);
> - currentsd = kzalloc(sizeof(*currentsd) *
> - (CCISS_MAX_SCSI_DEVS_PER_HBA+1), GFP_KERNEL);
> + currentsd = kcalloc(CCISS_MAX_SCSI_DEVS_PER_HBA + 1,
> + sizeof(*currentsd), GFP_KERNEL);
> if (ld_buff == NULL || inq_buff == NULL || currentsd == NULL) {
> printk(KERN_ERR "cciss: out of memory\n");
> goto out;
> diff -u -p a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> --- a/drivers/block/xen-blkfront.c 2011-11-13 11:07:22.680095573 +0100
> +++ b/drivers/block/xen-blkfront.c 2011-11-28 19:49:29.109460410 +0100
> @@ -156,7 +156,7 @@ static int xlbd_reserve_minors(unsigned
> if (end > nr_minors) {
> unsigned long *bitmap, *old;
>
> - bitmap = kzalloc(BITS_TO_LONGS(end) * sizeof(*bitmap),
> + bitmap = kcalloc(BITS_TO_LONGS(end), sizeof(*bitmap),
> GFP_KERNEL);
> if (bitmap == NULL)
> return -ENOMEM;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-14 18:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1322600880.1534.293.camel@localhost.localdomain>
2011-12-06 3:27 ` [PATCH] xen-blkfront: Use kcalloc instead of kzalloc to allocate array Konrad Rzeszutek Wilk
2011-12-14 18:56 ` Konrad Rzeszutek Wilk
2011-11-29 21:08 Thomas Meyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).