998d337c2b
To keep kernel debian stx aligned with centos stx, porting below commits
from centos stx to debian stx:
(1)patches related
ef3c9a4 kernel: Add auxiliary bus support
19ca0df kernel: Backport IRQ affinity patches
a10b746 workqueue affinity: Remove unused variable
8fde1a8 kthread_cpus: Avoid large stack allocation
bb6ec66 scsi: Make the disk detection order more consistent
bf940a8 rcu: Avoid RCU-related unexpected reboot
cfe452a workqueue: Affine rescuer threads and unbound wqs
(2)config related
6fe8d60 kernel: Disable NVMe multi-path kconfig option
c9cdb90 Fixup recent kconfig cleanup
8551799 Resolve v5.10 kernel configuration file differences
(3)kernel-modules related
7ded004 kernel-modules: IRQ affinity hint fix-ups
Please pay attention to:
[ef3c9a4 kernel: Add auxiliary bus support]
which is not only related with kernel patches but also related with
kernel-modules.
It removes the auxiliary.ko from the oot ice package because auxiliary
bus device driver is built into kernel. But the detecting of builtin
auxiliary driver in intel-iavf/intel-ice oot driver will fail because
debian has 2 linux header packages. So extra patches are added for
intel-iavf and intel-ice to pass linux common header to check_aux_bus
to make builtin auxiliary driver detected. At the same time the patch
[check_aux_bus: Look for kernel headers in the right location]
for the oot drivers is removed because it isn't needed any more if
the right header path is passed.
Test Plan:
- PASS: Build kernel-std/kernel-rt.
- PASS: Build the 7 oot kernel modules for kernel-std/kernel-rt.
- PASS: Build the iso for kernel-std and modules and boot up on qemu.
- PASS: Build the test iso for kernel-rt and modules and boot up
on qemu.
Story: 2009221
Task: 44989
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Change-Id: Ic7cddc068eab1516800e90bfe431d042274f86d3
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 09b57232d358202d79e2133d523a664906e9759c Mon Sep 17 00:00:00 2001
|
|
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
|
Date: Tue, 13 Jul 2021 12:34:38 +0300
|
|
Subject: [PATCH] driver core: auxiliary bus: Fix memory leak when
|
|
driver_register() fail
|
|
|
|
If driver_register() returns with error we need to free the memory
|
|
allocated for auxdrv->driver.name before returning from
|
|
__auxiliary_driver_register()
|
|
|
|
Fixes: 7de3697e9cbd4 ("Add auxiliary bus support")
|
|
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
|
|
Cc: stable <stable@vger.kernel.org>
|
|
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
|
Link: https://lore.kernel.org/r/20210713093438.3173-1-peter.ujfalusi@linux.intel.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 4afa0c22eed33cfe0c590742387f0d16f32412f3)
|
|
Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
|
|
---
|
|
drivers/base/auxiliary.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
|
|
index adc199dfba3c..6a30264ab2ba 100644
|
|
--- a/drivers/base/auxiliary.c
|
|
+++ b/drivers/base/auxiliary.c
|
|
@@ -231,6 +231,8 @@ EXPORT_SYMBOL_GPL(auxiliary_find_device);
|
|
int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,
|
|
struct module *owner, const char *modname)
|
|
{
|
|
+ int ret;
|
|
+
|
|
if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table))
|
|
return -EINVAL;
|
|
|
|
@@ -246,7 +248,11 @@ int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,
|
|
auxdrv->driver.bus = &auxiliary_bus_type;
|
|
auxdrv->driver.mod_name = modname;
|
|
|
|
- return driver_register(&auxdrv->driver);
|
|
+ ret = driver_register(&auxdrv->driver);
|
|
+ if (ret)
|
|
+ kfree(auxdrv->driver.name);
|
|
+
|
|
+ return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__auxiliary_driver_register);
|
|
|
|
--
|
|
2.29.2
|
|
|