lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IB] Fix leak on MAD initialization failure

Browse Source 
There is a bug in ib_mad_init_device(): if ib_agent_port_open() fails
for a given port, then the current code doesn't call ib_mad_port_close()
for that port.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier
2005-10-06 13:28:16 -07:00
parent e23d6d2b09
commit 4ab6fb7e5b
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/infiniband/core/mad.c
View File

@@ -2683,40 +2683,47 @@ static int ib_mad_port_close(struct ib_device *device, int port_num)
static void ib_mad_init_device(struct ib_device *device) static void ib_mad_init_device(struct ib_device *device)
{ {
int num_ports, cur_port, i; int start, end, i;
if (device->node_type == IB_NODE_SWITCH) { if (device->node_type == IB_NODE_SWITCH) {
num_ports = 1; start = 0;
cur_port = 0; end = 0;
} else { } else {
num_ports = device->phys_port_cnt; start = 1;
cur_port = 1; end = device->phys_port_cnt;
} }
for (i = 0; i < num_ports; i++, cur_port++) {
if (ib_mad_port_open(device, cur_port)) { for (i = start; i <= end; i++) {
if (ib_mad_port_open(device, i)) {
printk(KERN_ERR PFX "Couldn't open %s port %d\n", printk(KERN_ERR PFX "Couldn't open %s port %d\n",
device->name, cur_port); device->name, i);
goto error_device_open; goto error;
} }
if (ib_agent_port_open(device, cur_port)) { if (ib_agent_port_open(device, i)) {
printk(KERN_ERR PFX "Couldn't open %s port %d " printk(KERN_ERR PFX "Couldn't open %s port %d "
"for agents\n", "for agents\n",
device->name, cur_port); device->name, i);
goto error_device_open; goto error_agent;
} }
} }
return; return;
error_device_open: error_agent:
while (i > 0) { if (ib_mad_port_close(device, i))
cur_port--; printk(KERN_ERR PFX "Couldn't close %s port %d\n",
if (ib_agent_port_close(device, cur_port)) device->name, i);
error:
i--;
while (i >= start) {
if (ib_agent_port_close(device, i))
printk(KERN_ERR PFX "Couldn't close %s port %d " printk(KERN_ERR PFX "Couldn't close %s port %d "
"for agents\n", "for agents\n",
device->name, cur_port); device->name, i);
if (ib_mad_port_close(device, cur_port)) if (ib_mad_port_close(device, i))
printk(KERN_ERR PFX "Couldn't close %s port %d\n", printk(KERN_ERR PFX "Couldn't close %s port %d\n",
device->name, cur_port); device->name, i);
i--; i--;
} }
} }