mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
ALSA: seq: Do error checks at creating system ports
[ Upstream commit b8e131542b
]
snd_seq_system_client_init() doesn't check the errors returned from
its port creations. Let's do it properly and handle the error paths.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c2f459d334
commit
f7b2312c68
1 changed files with 15 additions and 3 deletions
|
@ -123,6 +123,7 @@ int __init snd_seq_system_client_init(void)
|
|||
{
|
||||
struct snd_seq_port_callback pcallbacks;
|
||||
struct snd_seq_port_info *port;
|
||||
int err;
|
||||
|
||||
port = kzalloc(sizeof(*port), GFP_KERNEL);
|
||||
if (!port)
|
||||
|
@ -144,7 +145,10 @@ int __init snd_seq_system_client_init(void)
|
|||
port->flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT;
|
||||
port->addr.client = sysclient;
|
||||
port->addr.port = SNDRV_SEQ_PORT_SYSTEM_TIMER;
|
||||
snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, port);
|
||||
err = snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT,
|
||||
port);
|
||||
if (err < 0)
|
||||
goto error_port;
|
||||
|
||||
/* register announcement port */
|
||||
strcpy(port->name, "Announce");
|
||||
|
@ -154,16 +158,24 @@ int __init snd_seq_system_client_init(void)
|
|||
port->flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT;
|
||||
port->addr.client = sysclient;
|
||||
port->addr.port = SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE;
|
||||
snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, port);
|
||||
err = snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT,
|
||||
port);
|
||||
if (err < 0)
|
||||
goto error_port;
|
||||
announce_port = port->addr.port;
|
||||
|
||||
kfree(port);
|
||||
return 0;
|
||||
|
||||
error_port:
|
||||
snd_seq_system_client_done();
|
||||
kfree(port);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
/* unregister our internal client */
|
||||
void __exit snd_seq_system_client_done(void)
|
||||
void snd_seq_system_client_done(void)
|
||||
{
|
||||
int oldsysclient = sysclient;
|
||||
|
||||
|
|
Loading…
Reference in a new issue