]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
driver core: auxiliary bus: Fix auxiliary bus shutdown null auxdrv ptr
authorDave Jiang <dave.jiang@intel.com>
Fri, 4 Dec 2020 16:46:49 +0000 (09:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Dec 2020 15:47:42 +0000 (16:47 +0100)
If the probe of the auxdrv failed, the device->driver is set to NULL.
During kernel shutdown, the bus shutdown will call auxdrv->shutdown and
cause an invalid ptr dereference. Add check to make sure device->driver is
not NULL before we proceed.

Fixes: 7de3697e9cbd ("Add auxiliary bus support")
Cc: Dave Ertman <david.m.ertman@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/160710040926.1889434.8840329810698403478.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/auxiliary.c

index f303daadf8434216536980c604b32ad87af349e3..8336535f1e110219992b2c765a6b81cfdfdbb53e 100644 (file)
@@ -92,10 +92,15 @@ static int auxiliary_bus_remove(struct device *dev)
 
 static void auxiliary_bus_shutdown(struct device *dev)
 {
-       struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver);
-       struct auxiliary_device *auxdev = to_auxiliary_dev(dev);
+       struct auxiliary_driver *auxdrv = NULL;
+       struct auxiliary_device *auxdev;
+
+       if (dev->driver) {
+               auxdrv = to_auxiliary_drv(dev->driver);
+               auxdev = to_auxiliary_dev(dev);
+       }
 
-       if (auxdrv->shutdown)
+       if (auxdrv && auxdrv->shutdown)
                auxdrv->shutdown(auxdev);
 }