Unverified Commit 36fb6a3c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-6.6-2' of... 

Merge tag 'imx-fixes-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 6.6, round 2:

- Fix an use_after_free bug in imx_dsp_setup_channels() that is
  introduced by commit e527adfb ("firmware: imx-dsp: Fix an error
  handling path in imx_dsp_setup_channels()")

* tag 'imx-fixes-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  firmware/imx-dsp: Fix use_after_free in imx_dsp_setup_channels()

Link: https://lore.kernel.org/r/20231015090202.GW819755@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 606c577f 1558b1a8

drivers/firmware/imx/imx-dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ static int imx_dsp_setup_channels(struct imx_dsp_ipc *dsp_ipc) 
		dsp_chan->idx = i % 2;

		dsp_chan->ch = mbox_request_channel_byname(cl, chan_name);

		if (IS_ERR(dsp_chan->ch)) {

			kfree(dsp_chan->name);

			ret = PTR_ERR(dsp_chan->ch);

			if (ret != -EPROBE_DEFER)

				dev_err(dev, "Failed to request mbox chan %s ret %d\n",

					chan_name, ret);

			kfree(dsp_chan->name);

			goto out;

		}