diff options
| author | Curtis Malainey <cujomalainey@chromium.org> | 2021-01-20 21:00:23 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-22 06:27:47 +0000 |
| commit | de283dc565bd43fa716a1be04cd2cd2e5e8b2e81 (patch) | |
| tree | c8304ce59013278399c16c646a29eebca07c417b | |
| parent | 95f4a95835ddbce4c0f084633f3895de63fad5f8 (diff) | |
| download | adhd-de283dc565bd43fa716a1be04cd2cd2e5e8b2e81.tar.gz | |
ucm: check manager before acting
Sometimes alsa_io set_active_node can be called before UCM is setup
which results in a null pointer dereference. Lets check the arguement
before doing anything.
BUG=b:177421997
TEST=test change on known bad soraka build
Change-Id: Idb4eedff37ebfa55c261b66f390cef26c24e079a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2639611
Tested-by: Curtis Malainey <cujomalainey@chromium.org>
Auto-Submit: Curtis Malainey <cujomalainey@chromium.org>
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Commit-Queue: Curtis Malainey <cujomalainey@chromium.org>
| -rw-r--r-- | cras/src/server/cras_alsa_ucm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cras/src/server/cras_alsa_ucm.c b/cras/src/server/cras_alsa_ucm.c index 04091be0..8f922ed5 100644 --- a/cras/src/server/cras_alsa_ucm.c +++ b/cras/src/server/cras_alsa_ucm.c @@ -996,6 +996,10 @@ void ucm_disable_all_hotword_models(struct cras_use_case_mgr *mgr) { const char **list; int num_enmods, mod_idx; + + if (!mgr) + return; + /* Disable all currently enabled hotword model modifiers. */ num_enmods = snd_use_case_get_list(mgr->mgr, "_enamods", &list); if (num_enmods <= 0) |