ASoC: sma1307: Add NULL check in sma1307_setting_loaded()
Subsystems (3)
PATCH 1/1 ASoC: sma1307: Add NULL check in sma1307_setting_loaded()
All varibale allocated by kzalloc and devm_kzalloc could be NULL. Multiple pointer checks and their cleanup are added.
This issue is found by our static analysis tool
--- sound/soc/codecs/sma1307.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
sound/soc/codecs/sma1307.c +28 -0
@@ -1728,6 +1728,11 @@ static void sma1307_setting_loaded(struct sma1307_priv *sma1307, const char *fil } data =kzalloc (fw->size,GFP_KERNEL ); +if (!data) { +release_firmware (fw); + sma1307->set.status = false; +return ; + } size = fw->size >>2 ;memcpy (data, fw->data, fw->size);
@@ -1741,6 +1746,12 @@ static void sma1307_setting_loaded(struct sma1307_priv *sma1307, const char *fil sma1307->set.header =devm_kzalloc (sma1307->dev, sma1307->set.header_size,GFP_KERNEL ); +if (!sma1307->set.header) { +kfree (data); + sma1307->set.status = false; +return ; + } +memcpy (sma1307->set.header, data, sma1307->set.header_size *sizeof (int ));
@@ -1756,6 +1767,13 @@ static void sma1307_setting_loaded(struct sma1307_priv *sma1307, const char *fil sma1307->set.def =devm_kzalloc (sma1307->dev, sma1307->set.def_size *sizeof (int ),GFP_KERNEL ); +if (!sma1307->set.def) { +kfree (data); +kfree (sma1307->set.header); + sma1307->set.status = false; +return ; + } +memcpy (sma1307->set.def, &data[sma1307->set.header_size], sma1307->set.def_size *sizeof (int ));
@@ -1768,6 +1786,16 @@ static void sma1307_setting_loaded(struct sma1307_priv *sma1307, const char *fil = devm_kzalloc(sma1307->dev, sma1307->set.mode_size *2 *sizeof (int ),GFP_KERNEL ); +if (!sma1307->set.mode_set[i]) { +kfree (data); +kfree (sma1307->set.header); +kfree (sma1307->set.def); +for (int j =0 ; j < i; j++) +kfree (sma1307->set.mode_set[j]); + sma1307->set.status = false; +return ; + } +for (int j =0 ; j < sma1307->set.mode_size; j++) { sma1307->set.mode_set[i][2 * j] = data[offset + ((num_mode +1 ) * j)];
Signature · 1 line
2.34.1
Mark Brown
maintainerQuoted 6 lines · Chenyuan Yang
All varibale allocated by kzalloc and
devm_kzalloccould be NULL. Multiple pointer checks and their cleanup are added.This issue is found by our static analysis tool
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: sma1307: Add NULL check in sma1307_setting_loaded()
commit: 0ec6bd16705fe21d6429d6b8f7981eae2142bba8
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark