lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 052/102] ASoC: SOF: Fix NULL pointer exception in sof_pci_probe callback
    Date
    From: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>

    [ Upstream commit c61711c1c95791850be48dd65a1d72eb34ba719f ]

    We are accessing "desc->ops" in sof_pci_probe without checking "desc"
    pointer. This results in NULL pointer exception if pci_id->driver_data
    i.e desc pointer isn't defined in sof device probe:

    BUG: kernel NULL pointer dereference, address: 0000000000000060
    PGD 0 P4D 0
    Oops: 0000 [#1] PREEMPT SMP NOPTI
    RIP: 0010:sof_pci_probe+0x1e/0x17f [snd_sof_pci]
    Code: Unable to access opcode bytes at RIP 0xffffffffc043dff4.
    RSP: 0018:ffffac4b03b9b8d8 EFLAGS: 00010246

    Add NULL pointer check for sof_dev_desc pointer to avoid such exception.

    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20220426183357.102155-1-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/sof-pci-dev.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
    index bc9e70765678..b773289c928d 100644
    --- a/sound/soc/sof/sof-pci-dev.c
    +++ b/sound/soc/sof/sof-pci-dev.c
    @@ -129,6 +129,11 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)

    dev_dbg(&pci->dev, "PCI DSP detected");

    + if (!desc) {
    + dev_err(dev, "error: no matching PCI descriptor\n");
    + return -ENODEV;
    + }
    +
    if (!desc->ops) {
    dev_err(dev, "error: no matching PCI descriptor ops\n");
    return -ENODEV;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-16 22:25    [W:4.099 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site