diff options
| author | Volodymyr G Lukiianyk <volodymyrgl@gmail.com> | 2008-04-29 03:17:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-29 03:17:42 -0700 |
| commit | 43af8532ecd74a61f9e7aeb27c026c1ee27915ca (patch) | |
| tree | b7a012195373a4ac2d43f949199199bab7e5e30d /net/bridge | |
| parent | 9a732ed6d0e126d4c8a818f42a13f3df11755bee (diff) | |
| download | op-kernel-dev-43af8532ecd74a61f9e7aeb27c026c1ee27915ca.zip op-kernel-dev-43af8532ecd74a61f9e7aeb27c026c1ee27915ca.tar.gz | |
bridge: fix error handling in br_add_if()
When device is added to bridge its refcnt is incremented (in new_nbp()), but if
error occurs during further br_add_if() operations this counter is not
decremented back. Fix it by adding dev_put() call in the error path.
Signed-off-by: Volodymyr G Lukiianyk <volodymyrgl@gmail.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_if.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 298e0f4..77a981a 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -411,9 +411,12 @@ err2: br_fdb_delete_by_port(br, p, 1); err1: kobject_del(&p->kobj); - return err; + goto put_back; err0: kobject_put(&p->kobj); + +put_back: + dev_put(dev); return err; } |
