2007-08-06 20:17:21

by Mariusz Kozlowski

Subject: [PATCH] drivers/net/ibmveth.c: memset fix

Hello,

Looks like memset() is zeroing wrong nr of bytes.

Signed-off-by: Mariusz Kozlowski <[email protected]>

drivers/net/ibmveth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.23-rc1-mm2-a/drivers/net/ibmveth.c 2007-08-01 08:43:46.000000000 +0200
+++ linux-2.6.23-rc1-mm2-b/drivers/net/ibmveth.c 2007-08-06 20:34:44.000000000 +0200
@@ -963,7 +963,7 @@ static int __devinit ibmveth_probe(struc
{
int rc, i;
struct net_device *netdev;
- struct ibmveth_adapter *adapter = NULL;
+ struct ibmveth_adapter *adapter;

unsigned char *mac_addr_p;
unsigned int *mcastFilterSize_p;
@@ -997,7 +997,7 @@ static int __devinit ibmveth_probe(struc
SET_MODULE_OWNER(netdev);

adapter = netdev->priv;
- memset(adapter, 0, sizeof(adapter));
+ memset(adapter, 0, sizeof(*adapter));
dev->dev.driver_data = netdev;

adapter->vdev = dev;

2007-08-06 20:37:26

by Brian King

Subject: Re: [PATCH] drivers/net/ibmveth.c: memset fix

Mariusz Kozlowski wrote:
> Hello,
>
> Looks like memset() is zeroing wrong nr of bytes.

Good catch, however, I think we can just remove this memset altogether
since the memory gets allocated via kzalloc.

-Brian


>
> Signed-off-by: Mariusz Kozlowski <[email protected]>
>
> drivers/net/ibmveth.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-2.6.23-rc1-mm2-a/drivers/net/ibmveth.c 2007-08-01 08:43:46.000000000 +0200
> +++ linux-2.6.23-rc1-mm2-b/drivers/net/ibmveth.c 2007-08-06 20:34:44.000000000 +0200
> @@ -963,7 +963,7 @@ static int __devinit ibmveth_probe(struc
> {
> int rc, i;
> struct net_device *netdev;
> - struct ibmveth_adapter *adapter = NULL;
> + struct ibmveth_adapter *adapter;
>
> unsigned char *mac_addr_p;
> unsigned int *mcastFilterSize_p;
> @@ -997,7 +997,7 @@ static int __devinit ibmveth_probe(struc
> SET_MODULE_OWNER(netdev);
>
> adapter = netdev->priv;
> - memset(adapter, 0, sizeof(adapter));
> + memset(adapter, 0, sizeof(*adapter));
> dev->dev.driver_data = netdev;
>
> adapter->vdev = dev;
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html


--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center

2007-08-06 20:44:24

by Jeff Garzik

Subject: Re: [PATCH] drivers/net/ibmveth.c: memset fix

Brian King wrote:
> Mariusz Kozlowski wrote:
>> Hello,
>>
>> Looks like memset() is zeroing wrong nr of bytes.
>
> Good catch, however, I think we can just remove this memset altogether
> since the memory gets allocated via kzalloc.

Correct, that memset() is superfluous.

Jeff

2007-08-06 21:44:23

by Mariusz Kozlowski

Subject: Re: [PATCH] drivers/net/ibmveth.c: memset fix

> >> Looks like memset() is zeroing wrong nr of bytes.
> >
> > Good catch, however, I think we can just remove this memset altogether
> > since the memory gets allocated via kzalloc.
>
> Correct, that memset() is superfluous.

Ok. Then this should do it.

Signed-off-by: Mariusz Kozlowski <[email protected]>

drivers/net/ibmveth.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- linux-2.6.23-rc1-mm2-a/drivers/net/ibmveth.c 2007-08-01 08:43:46.000000000 +0200
+++ linux-2.6.23-rc1-mm2-b/drivers/net/ibmveth.c 2007-08-06 23:32:13.000000000 +0200
@@ -963,7 +963,7 @@ static int __devinit ibmveth_probe(struc
{
int rc, i;
struct net_device *netdev;
- struct ibmveth_adapter *adapter = NULL;
+ struct ibmveth_adapter *adapter;

unsigned char *mac_addr_p;
unsigned int *mcastFilterSize_p;
@@ -997,7 +997,6 @@ static int __devinit ibmveth_probe(struc
SET_MODULE_OWNER(netdev);

adapter = netdev->priv;
- memset(adapter, 0, sizeof(adapter));
dev->dev.driver_data = netdev;

adapter->vdev = dev;

2007-08-07 15:41:06

by Brian King

Subject: Re: [PATCH] drivers/net/ibmveth.c: memset fix

Mariusz Kozlowski wrote:
>>>> Looks like memset() is zeroing wrong nr of bytes.
>>> Good catch, however, I think we can just remove this memset altogether
>>> since the memory gets allocated via kzalloc.
>> Correct, that memset() is superfluous.
>
> Ok. Then this should do it.

Acked-by: Brian King <[email protected]>

>
> Signed-off-by: Mariusz Kozlowski <[email protected]>
>
> drivers/net/ibmveth.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- linux-2.6.23-rc1-mm2-a/drivers/net/ibmveth.c 2007-08-01 08:43:46.000000000 +0200
> +++ linux-2.6.23-rc1-mm2-b/drivers/net/ibmveth.c 2007-08-06 23:32:13.000000000 +0200
> @@ -963,7 +963,7 @@ static int __devinit ibmveth_probe(struc
> {
> int rc, i;
> struct net_device *netdev;
> - struct ibmveth_adapter *adapter = NULL;
> + struct ibmveth_adapter *adapter;
>
> unsigned char *mac_addr_p;
> unsigned int *mcastFilterSize_p;
> @@ -997,7 +997,6 @@ static int __devinit ibmveth_probe(struc
> SET_MODULE_OWNER(netdev);
>
> adapter = netdev->priv;
> - memset(adapter, 0, sizeof(adapter));
> dev->dev.driver_data = netdev;
>
> adapter->vdev = dev;
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html


--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center

2007-08-07 22:00:37

by Jeff Garzik

Subject: Re: [PATCH] drivers/net/ibmveth.c: memset fix

Mariusz Kozlowski wrote:
>>>> Looks like memset() is zeroing wrong nr of bytes.
>>> Good catch, however, I think we can just remove this memset altogether
>>> since the memory gets allocated via kzalloc.
>> Correct, that memset() is superfluous.
>
> Ok. Then this should do it.
>
> Signed-off-by: Mariusz Kozlowski <[email protected]>
>
> drivers/net/ibmveth.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

applied