| Message ID | 20230915021344.3078-1-nichen@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c04efbfd76d23157e64e6d6147518c187ab4233a |
| Headers | show |
| Series | ASoC: hdaudio.c: Add missing check for devm_kstrdup | expand |
On 9/15/2023 4:13 AM, Chen Ni wrote: > Because of the potential failure of the devm_kstrdup(), the > dl[i].codecs->name could be NULL. > Therefore, we need to check it and return -ENOMEM in order to transfer > the error. > > Fixes: 97030a43371e ("ASoC: Intel: avs: Add HDAudio machine board") > Signed-off-by: Chen Ni <nichen@iscas.ac.cn> > --- > sound/soc/intel/avs/boards/hdaudio.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c > index cb00bc86ac94..8876558f19a1 100644 > --- a/sound/soc/intel/avs/boards/hdaudio.c > +++ b/sound/soc/intel/avs/boards/hdaudio.c > @@ -55,6 +55,9 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int > return -ENOMEM; > > dl[i].codecs->name = devm_kstrdup(dev, cname, GFP_KERNEL); > + if (!dl[i].codecs->name) > + return -ENOMEM; > + > dl[i].codecs->dai_name = pcm->name; > dl[i].num_codecs = 1; > dl[i].num_cpus = 1; Good catch Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
On Fri, 15 Sep 2023 02:13:44 +0000, Chen Ni wrote: > Because of the potential failure of the devm_kstrdup(), the > dl[i].codecs->name could be NULL. > Therefore, we need to check it and return -ENOMEM in order to transfer > the error. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: hdaudio.c: Add missing check for devm_kstrdup commit: c04efbfd76d23157e64e6d6147518c187ab4233a 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
diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index cb00bc86ac94..8876558f19a1 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -55,6 +55,9 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int return -ENOMEM; dl[i].codecs->name = devm_kstrdup(dev, cname, GFP_KERNEL); + if (!dl[i].codecs->name) + return -ENOMEM; + dl[i].codecs->dai_name = pcm->name; dl[i].num_codecs = 1; dl[i].num_cpus = 1;
Because of the potential failure of the devm_kstrdup(), the dl[i].codecs->name could be NULL. Therefore, we need to check it and return -ENOMEM in order to transfer the error. Fixes: 97030a43371e ("ASoC: Intel: avs: Add HDAudio machine board") Signed-off-by: Chen Ni <nichen@iscas.ac.cn> --- sound/soc/intel/avs/boards/hdaudio.c | 3 +++ 1 file changed, 3 insertions(+)