diff options
| author | Antonio Ospite <ao2@ao2.it> | 2016-09-23 18:11:16 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-29 09:55:08 +0200 |
| commit | 4ec907c773a807d58b17f909522c27d05878b5b5 (patch) | |
| tree | 4a3972a955577f6a827ff62a09f30ec7ff63f67d | |
| parent | 0fc4b4d17bfd0ce44394f6040e1d5f9dfa97a5ad (diff) | |
| download | alsa-lib-4ec907c773a807d58b17f909522c27d05878b5b5.tar.gz | |
ucm: fix crash when calling snd_use_case_geti() with no device or modifier
When calling snd_use_case_geti(uc_mgr, "_devstatus", &lvalue) the code
ends up calling device_status(uc_mgr, NULL), which result in a crash in
strcmp(dev->name, NULL), when there are enabled devices.
This happens because snd_use_case_geti() allows a "_devstatus"
identifier even if it's only supposed to allow the form
"_devstatus/{device}".
So check that the device name is not null.
The same issue occurs with "_modstatus", this change fixes that as well.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | src/ucm/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ucm/main.c b/src/ucm/main.c index 24d9510e..8cc92089 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -1528,12 +1528,20 @@ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr, str = NULL; } if (check_identifier(identifier, "_devstatus")) { + if (!str) { + err = -EINVAL; + goto __end; + } err = device_status(uc_mgr, str); if (err >= 0) { *value = err; err = 0; } } else if (check_identifier(identifier, "_modstatus")) { + if (!str) { + err = -EINVAL; + goto __end; + } err = modifier_status(uc_mgr, str); if (err >= 0) { *value = err; |