leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipmi: Properly release srcu locks on error conditions

Browse Source 
When SRCU was added for handling hotplug, some error conditions
were not handled properly.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Corey Minyard 2018-05-24 15:07:29 -05:00
parent 58aae18eb9
commit 048f7c3e35
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/char/ipmi/ipmi_msghandler.c
View File

@ -1291,18 +1291,19 @@ int ipmi_set_my_address(struct ipmi_user *user,
unsigned int channel, unsigned int channel,
unsigned char address) unsigned char address)
{ {
int index; int index, rv = 0;
user = acquire_ipmi_user(user, &index); user = acquire_ipmi_user(user, &index);
if (!user) if (!user)
return -ENODEV; return -ENODEV;
if (channel >= IPMI_MAX_CHANNELS) if (channel >= IPMI_MAX_CHANNELS)
return -EINVAL; rv = -EINVAL;
user->intf->addrinfo[channel].address = address; else
user->intf->addrinfo[channel].address = address;
release_ipmi_user(user, index); release_ipmi_user(user, index);
return 0; return rv;
} }
EXPORT_SYMBOL(ipmi_set_my_address); EXPORT_SYMBOL(ipmi_set_my_address);
@ -1310,18 +1311,19 @@ int ipmi_get_my_address(struct ipmi_user *user,
unsigned int channel, unsigned int channel,
unsigned char *address) unsigned char *address)
{ {
int index; int index, rv = 0;
user = acquire_ipmi_user(user, &index); user = acquire_ipmi_user(user, &index);
if (!user) if (!user)
return -ENODEV; return -ENODEV;
if (channel >= IPMI_MAX_CHANNELS) if (channel >= IPMI_MAX_CHANNELS)
return -EINVAL; rv = -EINVAL;
*address = user->intf->addrinfo[channel].address; else
*address = user->intf->addrinfo[channel].address;
release_ipmi_user(user, index); release_ipmi_user(user, index);
return 0; return rv;
} }
EXPORT_SYMBOL(ipmi_get_my_address); EXPORT_SYMBOL(ipmi_get_my_address);
@ -1329,15 +1331,16 @@ int ipmi_set_my_LUN(struct ipmi_user *user,
unsigned int channel, unsigned int channel,
unsigned char LUN) unsigned char LUN)
{ {
int index; int index, rv = 0;
user = acquire_ipmi_user(user, &index); user = acquire_ipmi_user(user, &index);
if (!user) if (!user)
return -ENODEV; return -ENODEV;
if (channel >= IPMI_MAX_CHANNELS) if (channel >= IPMI_MAX_CHANNELS)
return -EINVAL; rv = -EINVAL;
user->intf->addrinfo[channel].lun = LUN & 0x3; else
user->intf->addrinfo[channel].lun = LUN & 0x3;
release_ipmi_user(user, index); release_ipmi_user(user, index);
return 0; return 0;
@ -1348,18 +1351,19 @@ int ipmi_get_my_LUN(struct ipmi_user *user,
unsigned int channel, unsigned int channel,
unsigned char *address) unsigned char *address)
{ {
int index; int index, rv = 0;
user = acquire_ipmi_user(user, &index); user = acquire_ipmi_user(user, &index);
if (!user) if (!user)
return -ENODEV; return -ENODEV;
if (channel >= IPMI_MAX_CHANNELS) if (channel >= IPMI_MAX_CHANNELS)
return -EINVAL; rv = -EINVAL;
*address = user->intf->addrinfo[channel].lun; else
*address = user->intf->addrinfo[channel].lun;
release_ipmi_user(user, index); release_ipmi_user(user, index);
return 0; return rv;
} }
EXPORT_SYMBOL(ipmi_get_my_LUN); EXPORT_SYMBOL(ipmi_get_my_LUN);
@ -1540,8 +1544,10 @@ int ipmi_register_for_cmd(struct ipmi_user *user,
return -ENODEV; return -ENODEV;
rcvr = kmalloc(sizeof(*rcvr), GFP_KERNEL); rcvr = kmalloc(sizeof(*rcvr), GFP_KERNEL);
if (!rcvr) if (!rcvr) {
return -ENOMEM; rv = -ENOMEM;
goto out_release;
}
rcvr->cmd = cmd; rcvr->cmd = cmd;
rcvr->netfn = netfn; rcvr->netfn = netfn;
rcvr->chans = chans; rcvr->chans = chans;
@ -1559,10 +1565,11 @@ int ipmi_register_for_cmd(struct ipmi_user *user,
list_add_rcu(&rcvr->link, &intf->cmd_rcvrs); list_add_rcu(&rcvr->link, &intf->cmd_rcvrs);
out_unlock: out_unlock:
mutex_unlock(&intf->cmd_rcvrs_mutex); mutex_unlock(&intf->cmd_rcvrs_mutex);
if (rv) if (rv)
kfree(rcvr); kfree(rcvr);
out_release:
release_ipmi_user(user, index); release_ipmi_user(user, index);
return rv; return rv;