> -----Original Message----- > From: Vinod Koul [mailto:vinod.koul@xxxxxxxxx] > Sent: Thursday, May 12, 2016 12:09 PM > To: alsa-devel@xxxxxxxxxxxxxxxx > Cc: broonie@xxxxxxxxxx; liam.r.girdwood@xxxxxxxxxxxxxxx; > patches.audio@xxxxxxxxx; Bard Liao; Vinod Koul; Senthilnathan Veppur > Subject: [PATCH 1/2] ASoC: rt298: fix null deref on acpi driver data > > ACPI driver data can be NULL so we need to check that before > dereference the driver data. > > Signed-off-by: Senthilnathan Veppur <senthilnathanx.veppur@xxxxxxxxx> > Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx> Acked-by: Bard Liao <bardliao@xxxxxxxxxxx> > --- > sound/soc/codecs/rt298.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index > 68cf8d5a174f..45dc5fa24961 100644 > --- a/sound/soc/codecs/rt298.c > +++ b/sound/soc/codecs/rt298.c > @@ -1179,7 +1179,7 @@ static int rt298_i2c_probe(struct i2c_client > *i2c, > > /* enable jack combo mode on supported devices */ > acpiid = acpi_match_device(dev->driver->acpi_match_table, dev); > - if (acpiid) { > + if (acpiid && acpiid->driver_data) { > rt298->pdata = *(struct rt298_platform_data *) > acpiid->driver_data; > } > -- > 1.9.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
