2007-01-23 12:25:41

by Al Viro

Subject: [PATCH] s2io bogus memset

memset() after kmalloc() on size * 8 would better be on size * 8, not
just size; fixed by switching to kcalloc() - it's more idiomatic anyway.

Signed-off-by: Al Viro <[email protected]>
---
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -554,10 +554,9 @@ static int init_shared_mem(struct s2io_n
}
}

- nic->ufo_in_band_v = kmalloc((sizeof(u64) * size), GFP_KERNEL);
+ nic->ufo_in_band_v = kcalloc(size, sizeof(u64), GFP_KERNEL);
if (!nic->ufo_in_band_v)
return -ENOMEM;
- memset(nic->ufo_in_band_v, 0, size);

/* Allocation and initialization of RXDs in Rings */
size = 0;

2007-01-23 21:27:21

by Jeff Garzik

Subject: Re: [PATCH] s2io bogus memset

Al Viro wrote:
> memset() after kmalloc() on size * 8 would better be on size * 8, not
> just size; fixed by switching to kcalloc() - it's more idiomatic anyway.
>
> Signed-off-by: Al Viro <[email protected]>

applied