2011-06-13 14:30:12

by Peter Pan(潘卫平)

Subject: [PATCH] bonding:delete a dereference before check

Dan Carpenter found that there was a dereference before a check,
added in 56d00c677de0(bonding:delete lacp_fast from ad_bond_info).

Signed-off-by: Weiping Pan <[email protected]>
---
drivers/net/bonding/bond_3ad.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 6122725..77da2e8 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1900,7 +1900,6 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
int bond_3ad_bind_slave(struct slave *slave)
{
struct bonding *bond = bond_get_bond_by_slave(slave);
- int lacp_fast = bond->params.lacp_fast;
struct port *port;
struct aggregator *aggregator;

@@ -1916,7 +1915,7 @@ int bond_3ad_bind_slave(struct slave *slave)
// port initialization
port = &(SLAVE_AD_INFO(slave).port);

- ad_initialize_port(port, lacp_fast);
+ ad_initialize_port(port, bond->params.lacp_fast);

port->slave = slave;
port->actor_port_number = SLAVE_AD_INFO(slave).id;
--
1.7.4.4

2011-06-13 22:11:10

by Jay Vosburgh

Subject: Re: [PATCH] bonding:delete a dereference before check

Weiping Pan <[email protected]> wrote:

>Dan Carpenter found that there was a dereference before a check,
>added in 56d00c677de0(bonding:delete lacp_fast from ad_bond_info).
>
>Signed-off-by: Weiping Pan <[email protected]>

Signed-off-by: Jay Vosburgh <[email protected]>

-J

> drivers/net/bonding/bond_3ad.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
>index 6122725..77da2e8 100644
>--- a/drivers/net/bonding/bond_3ad.c
>+++ b/drivers/net/bonding/bond_3ad.c
>@@ -1900,7 +1900,6 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
> int bond_3ad_bind_slave(struct slave *slave)
> {
> struct bonding *bond = bond_get_bond_by_slave(slave);
>- int lacp_fast = bond->params.lacp_fast;
> struct port *port;
> struct aggregator *aggregator;
>
>@@ -1916,7 +1915,7 @@ int bond_3ad_bind_slave(struct slave *slave)
> // port initialization
> port = &(SLAVE_AD_INFO(slave).port);
>
>- ad_initialize_port(port, lacp_fast);
>+ ad_initialize_port(port, bond->params.lacp_fast);
>
> port->slave = slave;
> port->actor_port_number = SLAVE_AD_INFO(slave).id;
>--
>1.7.4.4

2011-06-13 22:30:14

by David Miller

Subject: Re: [PATCH] bonding:delete a dereference before check

From: Jay Vosburgh <[email protected]>
Date: Mon, 13 Jun 2011 15:11:01 -0700

> Weiping Pan <[email protected]> wrote:
>
>>Dan Carpenter found that there was a dereference before a check,
>>added in 56d00c677de0(bonding:delete lacp_fast from ad_bond_info).
>>
>>Signed-off-by: Weiping Pan <[email protected]>
>
> Signed-off-by: Jay Vosburgh <[email protected]>

Applied, thanks.