summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.cirrus.com>2024-08-05 14:42:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-14 16:34:22 +0300
commit5b6baaa7cbd77ff980516bad38bbc5a648bb5158 (patch)
tree2107152a2301f01240fe781eed2696e737f61eb0
parent0fcc4a5b5b485cc09a737a5eb16e19ee6318792b (diff)
downloadlinux-5b6baaa7cbd77ff980516bad38bbc5a648bb5158.tar.xz
ASoC: cs-amp-lib: Fix NULL pointer crash if efi.get_variable is NULL
[ Upstream commit dc268085e499666b9f4f0fcb4c5a94e1c0b193b3 ] Call efi_rt_services_supported() to check that efi.get_variable exists before calling it. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Fixes: 1cad8725f2b9 ("ASoC: cs-amp-lib: Add helpers for factory calibration data") Link: https://patch.msgid.link/20240805114222.15722-1-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--sound/soc/codecs/cs-amp-lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs-amp-lib.c b/sound/soc/codecs/cs-amp-lib.c
index 287ac01a3873..605964af8afa 100644
--- a/sound/soc/codecs/cs-amp-lib.c
+++ b/sound/soc/codecs/cs-amp-lib.c
@@ -108,7 +108,7 @@ static efi_status_t cs_amp_get_efi_variable(efi_char16_t *name,
KUNIT_STATIC_STUB_REDIRECT(cs_amp_get_efi_variable, name, guid, size, buf);
- if (IS_ENABLED(CONFIG_EFI))
+ if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))
return efi.get_variable(name, guid, &attr, size, buf);
return EFI_NOT_FOUND;