| Message ID | E1b0CjK-00007p-Fj@debutante (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Mark, 2016-05-10 20:50 GMT+02:00 Mark Brown <broonie@kernel.org>: > The patch > > ASoC: rockchip-max98090: Fix NULL pointer dereference while accessing to jack. > > has been applied to the asoc tree at > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git > > 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. > I just saw that these patches and the others in the patch series were not applied yet. As are fixes and were accepted since middle May, I expected see the patches merged in this release cycle, but we're at rc6 so I suppose I'll need to wait to see them merged for 4.8 merge window. Please can you coordinate with Heiko and make sure that these patches were merged before he merges the patches to enable the audio on Veyron? Otherwise we will break Veyron support for a while. I'd really like have audio working on Veyron. Thanks, Enric > 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 > > From af637e3adaf538288cbb3e6a2d9a4059853fc15a Mon Sep 17 00:00:00 2001 > From: Enric Balletbo i Serra <enric.balletbo@collabora.com> > Date: Mon, 9 May 2016 12:46:31 +0200 > Subject: [PATCH] ASoC: rockchip-max98090: Fix NULL pointer dereference while > accessing to jack. > > Commit f2ed6b07645e ("ASoC: Make aux_dev more like a generic > component") caused a regression on this driver, since now a > kernel oops is seen when rockchip-mac98090 driver is loaded. > > That commit changed the probing of aux_devs before checking > new DAI links, so for this driver rk_98090_headset_init is > called before rk_init and then the kernel oops due a NULL > pointer dereference inside rk_98090_headset_init function > since there is a call that tries to access the jack pointer > which has not been allocated yet. > > This is the call chain that causes the crash: > > rk_98090_headset_init > -> ts3a227e_enable_jack_detect > -> snd_jack_set_key > rk_init > -> snd_soc_card_jack_new > > This patch moves the new jack object creation from rk_init > to rk_98090_headset_init function making sure the jack is > created before is accessed. > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > sound/soc/rockchip/rockchip_max98090.c | 50 ++++++++++++++++++---------------- > 1 file changed, 27 insertions(+), 23 deletions(-) > > diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c > index 543610282cdb..abb64a553967 100644 > --- a/sound/soc/rockchip/rockchip_max98090.c > +++ b/sound/soc/rockchip/rockchip_max98090.c > @@ -114,43 +114,27 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, > return ret; > } > > -static int rk_init(struct snd_soc_pcm_runtime *runtime) > -{ > - /* Enable Headset and 4 Buttons Jack detection */ > - return snd_soc_card_jack_new(runtime->card, "Headset Jack", > - SND_JACK_HEADSET | > - SND_JACK_BTN_0 | SND_JACK_BTN_1 | > - SND_JACK_BTN_2 | SND_JACK_BTN_3, > - &headset_jack, > - headset_jack_pins, > - ARRAY_SIZE(headset_jack_pins)); > -} > - > -static int rk_98090_headset_init(struct snd_soc_component *component) > -{ > - return ts3a227e_enable_jack_detect(component, &headset_jack); > -} > - > static struct snd_soc_ops rk_aif1_ops = { > .hw_params = rk_aif1_hw_params, > }; > > -static struct snd_soc_aux_dev rk_98090_headset_dev = { > - .name = "Headset Chip", > - .init = rk_98090_headset_init, > -}; > - > static struct snd_soc_dai_link rk_dailink = { > .name = "max98090", > .stream_name = "Audio", > .codec_dai_name = "HiFi", > - .init = rk_init, > .ops = &rk_aif1_ops, > /* set max98090 as slave */ > .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | > SND_SOC_DAIFMT_CBS_CFS, > }; > > +static int rk_98090_headset_init(struct snd_soc_component *component); > + > +static struct snd_soc_aux_dev rk_98090_headset_dev = { > + .name = "Headset Chip", > + .init = rk_98090_headset_init, > +}; > + > static struct snd_soc_card snd_soc_card_rk = { > .name = "ROCKCHIP-I2S", > .owner = THIS_MODULE, > @@ -166,6 +150,26 @@ static struct snd_soc_card snd_soc_card_rk = { > .num_controls = ARRAY_SIZE(rk_mc_controls), > }; > > +static int rk_98090_headset_init(struct snd_soc_component *component) > +{ > + int ret; > + > + /* Enable Headset and 4 Buttons Jack detection */ > + ret = snd_soc_card_jack_new(&snd_soc_card_rk, "Headset Jack", > + SND_JACK_HEADSET | > + SND_JACK_BTN_0 | SND_JACK_BTN_1 | > + SND_JACK_BTN_2 | SND_JACK_BTN_3, > + &headset_jack, > + headset_jack_pins, > + ARRAY_SIZE(headset_jack_pins)); > + if (ret) > + return ret; > + > + ret = ts3a227e_enable_jack_detect(component, &headset_jack); > + > + return ret; > +} > + > static int snd_rk_mc_probe(struct platform_device *pdev) > { > int ret = 0; > -- > 2.8.1 >
On Mon, Jul 04, 2016 at 09:24:12AM +0200, Enric Balletbo Serra wrote: > I just saw that these patches and the others in the patch series were > not applied yet. As are fixes and were accepted since middle May, I No, they are actually applied like the e-mail said - please see my git. > expected see the patches merged in this release cycle, but we're at In general if you think a fix needs to go in urgently it's best to specifically identify this. If nothing is specifically said and it's not obviously related to something done recently then the tendency will be to assume that the issue was recently introduced and is a fix for a development version. > rc6 so I suppose I'll need to wait to see them merged for 4.8 merge > window. Please can you coordinate with Heiko and make sure that these > patches were merged before he merges the patches to enable the audio > on Veyron? Otherwise we will break Veyron support for a while. I'd > really like have audio working on Veyron. As things stand they'll be merged in the next merge window. They're buried in the middle of a branch with other things so I can't just send the branch as-is. If these new patches you're talking about are going to get merged in the merge window as well so we're presumably mostly fine?
2016-07-04 10:47 GMT+02:00 Mark Brown <broonie@kernel.org>: > On Mon, Jul 04, 2016 at 09:24:12AM +0200, Enric Balletbo Serra wrote: > >> I just saw that these patches and the others in the patch series were >> not applied yet. As are fixes and were accepted since middle May, I > > No, they are actually applied like the e-mail said - please see my git. > >> expected see the patches merged in this release cycle, but we're at > > In general if you think a fix needs to go in urgently it's best to > specifically identify this. If nothing is specifically said and it's > not obviously related to something done recently then the tendency will > be to assume that the issue was recently introduced and is a fix for a > development version. > >> rc6 so I suppose I'll need to wait to see them merged for 4.8 merge >> window. Please can you coordinate with Heiko and make sure that these >> patches were merged before he merges the patches to enable the audio >> on Veyron? Otherwise we will break Veyron support for a while. I'd >> really like have audio working on Veyron. > > As things stand they'll be merged in the next merge window. They're > buried in the middle of a branch with other things so I can't just send > the branch as-is. If these new patches you're talking about are going > to get merged in the merge window as well so we're presumably mostly > fine? Yeah it's fine as long as the patches will be merged in next merge window before the rockchip DTS updates. It's only that I expected see them merged, but probably was only something that I assumed wrongly. Thanks, Enric
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 543610282cdb..abb64a553967 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -114,43 +114,27 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, return ret; } -static int rk_init(struct snd_soc_pcm_runtime *runtime) -{ - /* Enable Headset and 4 Buttons Jack detection */ - return snd_soc_card_jack_new(runtime->card, "Headset Jack", - SND_JACK_HEADSET | - SND_JACK_BTN_0 | SND_JACK_BTN_1 | - SND_JACK_BTN_2 | SND_JACK_BTN_3, - &headset_jack, - headset_jack_pins, - ARRAY_SIZE(headset_jack_pins)); -} - -static int rk_98090_headset_init(struct snd_soc_component *component) -{ - return ts3a227e_enable_jack_detect(component, &headset_jack); -} - static struct snd_soc_ops rk_aif1_ops = { .hw_params = rk_aif1_hw_params, }; -static struct snd_soc_aux_dev rk_98090_headset_dev = { - .name = "Headset Chip", - .init = rk_98090_headset_init, -}; - static struct snd_soc_dai_link rk_dailink = { .name = "max98090", .stream_name = "Audio", .codec_dai_name = "HiFi", - .init = rk_init, .ops = &rk_aif1_ops, /* set max98090 as slave */ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, }; +static int rk_98090_headset_init(struct snd_soc_component *component); + +static struct snd_soc_aux_dev rk_98090_headset_dev = { + .name = "Headset Chip", + .init = rk_98090_headset_init, +}; + static struct snd_soc_card snd_soc_card_rk = { .name = "ROCKCHIP-I2S", .owner = THIS_MODULE, @@ -166,6 +150,26 @@ static struct snd_soc_card snd_soc_card_rk = { .num_controls = ARRAY_SIZE(rk_mc_controls), }; +static int rk_98090_headset_init(struct snd_soc_component *component) +{ + int ret; + + /* Enable Headset and 4 Buttons Jack detection */ + ret = snd_soc_card_jack_new(&snd_soc_card_rk, "Headset Jack", + SND_JACK_HEADSET | + SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3, + &headset_jack, + headset_jack_pins, + ARRAY_SIZE(headset_jack_pins)); + if (ret) + return ret; + + ret = ts3a227e_enable_jack_detect(component, &headset_jack); + + return ret; +} + static int snd_rk_mc_probe(struct platform_device *pdev) { int ret = 0;