* [GIT PULL v1 1/4] stm class: Fix a double free of stm_source_device
2019-08-21 7:49 [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
@ 2019-08-21 7:49 ` Alexander Shishkin
2019-08-21 7:49 ` [GIT PULL v1 2/4] intel_th: Use the correct style for SPDX License Identifier Alexander Shishkin
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Shishkin @ 2019-08-21 7:49 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel, Ding Xiang, Alexander Shishkin, stable
From: Ding Xiang <dingxiang@cmss.chinamobile.com>
In the error path of stm_source_register_device(), the kfree is
unnecessary, as the put_device() before it ends up calling
stm_source_device_release() to free stm_source_device, leading to
a double free at the outer kfree() call. Remove it.
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: 7bd1d4093c2fa ("stm class: Introduce an abstraction for System Trace Module devices")
Link: https://lore.kernel.org/linux-arm-kernel/1563354988-23826-1-git-send-email-dingxiang@cmss.chinamobile.com/
Cc: stable@vger.kernel.org # v4.4+
---
drivers/hwtracing/stm/core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index e55b902560de..181e7ff1ec4f 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -1276,7 +1276,6 @@ int stm_source_register_device(struct device *parent,
err:
put_device(&src->dev);
- kfree(src);
return err;
}
--
2.23.0.rc1
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL v1 2/4] intel_th: Use the correct style for SPDX License Identifier
2019-08-21 7:49 [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
2019-08-21 7:49 ` [GIT PULL v1 1/4] stm class: Fix a double free of stm_source_device Alexander Shishkin
@ 2019-08-21 7:49 ` Alexander Shishkin
2019-08-21 7:49 ` [GIT PULL v1 3/4] intel_th: pci: Add support for another Lewisburg PCH Alexander Shishkin
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Shishkin @ 2019-08-21 7:49 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, Nishad Kamdar, Joe Perches, Alexander Shishkin
From: Nishad Kamdar <nishadkamdar@gmail.com>
This patch corrects the SPDX License Identifier style
in header files related to Drivers for Intel(R) Trace Hub
controller.
For C header files Documentation/process/license-rules.rst
mandates C-like comments (opposed to C source files where
C++ style should be used)
Changes made by using a script provided by Joe Perches here:
https://lkml.org/lkml/2019/2/7/46
Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: 50352fa730328 ("intel_th: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate")
Link: https://lore.kernel.org/lkml/20190726142840.GA4301@nishad/
---
drivers/hwtracing/intel_th/msu.h | 2 +-
drivers/hwtracing/intel_th/pti.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hwtracing/intel_th/msu.h b/drivers/hwtracing/intel_th/msu.h
index 574c16004cb2..13d9b141daaa 100644
--- a/drivers/hwtracing/intel_th/msu.h
+++ b/drivers/hwtracing/intel_th/msu.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Intel(R) Trace Hub Memory Storage Unit (MSU) data structures
*
diff --git a/drivers/hwtracing/intel_th/pti.h b/drivers/hwtracing/intel_th/pti.h
index e9381babc84c..7dfc0431333b 100644
--- a/drivers/hwtracing/intel_th/pti.h
+++ b/drivers/hwtracing/intel_th/pti.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Intel(R) Trace Hub PTI output data structures
*
--
2.23.0.rc1
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL v1 3/4] intel_th: pci: Add support for another Lewisburg PCH
2019-08-21 7:49 [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
2019-08-21 7:49 ` [GIT PULL v1 1/4] stm class: Fix a double free of stm_source_device Alexander Shishkin
2019-08-21 7:49 ` [GIT PULL v1 2/4] intel_th: Use the correct style for SPDX License Identifier Alexander Shishkin
@ 2019-08-21 7:49 ` Alexander Shishkin
2019-08-21 7:49 ` [GIT PULL v1 4/4] intel_th: pci: Add Tiger Lake support Alexander Shishkin
2019-08-28 15:24 ` [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Shishkin @ 2019-08-21 7:49 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Shishkin, stable
Add support for the Trace Hub in another Lewisburg PCH.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: stable@vger.kernel.org # v4.14+
---
drivers/hwtracing/intel_th/pci.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index c0378c3de9a4..5c4e4fbec936 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -164,6 +164,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa1a6),
.driver_data = (kernel_ulong_t)0,
},
+ {
+ /* Lewisburg PCH */
+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa226),
+ .driver_data = (kernel_ulong_t)0,
+ },
{
/* Gemini Lake */
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e),
--
2.23.0.rc1
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL v1 4/4] intel_th: pci: Add Tiger Lake support
2019-08-21 7:49 [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
` (2 preceding siblings ...)
2019-08-21 7:49 ` [GIT PULL v1 3/4] intel_th: pci: Add support for another Lewisburg PCH Alexander Shishkin
@ 2019-08-21 7:49 ` Alexander Shishkin
2019-08-28 15:24 ` [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Shishkin @ 2019-08-21 7:49 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel, Alexander Shishkin, stable
This adds support for the Trace Hub in Tiger Lake PCH.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: stable@vger.kernel.org # v4.14+
---
drivers/hwtracing/intel_th/pci.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index 5c4e4fbec936..91dfeba62485 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -204,6 +204,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5),
.driver_data = (kernel_ulong_t)&intel_th_2x,
},
+ {
+ /* Tiger Lake PCH */
+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6),
+ .driver_data = (kernel_ulong_t)&intel_th_2x,
+ },
{ 0 },
};
--
2.23.0.rc1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3
2019-08-21 7:49 [GIT PULL v1 0/4] stm class/intel_th: Fixes for v5.3 Alexander Shishkin
` (3 preceding siblings ...)
2019-08-21 7:49 ` [GIT PULL v1 4/4] intel_th: pci: Add Tiger Lake support Alexander Shishkin
@ 2019-08-28 15:24 ` Alexander Shishkin
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Shishkin @ 2019-08-28 15:24 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel, alexander.shishkin
Alexander Shishkin <alexander.shishkin@linux.intel.com> writes:
> Hi Greg,
>
> These are the fixes that I have for v5.3. One is an actual bugfix that's
> copied to stable, one SPDX header fix and two new PCI IDs, copied to
> stable as well. Signed tag below, individual patches follow. Please
> consider applying or pulling. Thanks!
I forgot to attach the pull request to this one, but I figured, you'll
take patches anyway. Sorry about that.
The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b:
Linus 5.3-rc1 (2019-07-21 14:05:38 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git tags/stm-intel_th-fixes-for-greg-20190821
for you to fetch changes up to 9b2b12d5f2ea658c0441c9d066c7faeb4f949ad0:
intel_th: pci: Add Tiger Lake support (2019-08-21 10:40:48 +0300)
----------------------------------------------------------------
stm class/intel_th: Fixes for v5.3
These are:
* Double-free fix, going back to v4.4.
* SPDX license header fix.
* 2 new PCI IDs.
----------------------------------------------------------------
Alexander Shishkin (2):
intel_th: pci: Add support for another Lewisburg PCH
intel_th: pci: Add Tiger Lake support
Ding Xiang (1):
stm class: Fix a double free of stm_source_device
Nishad Kamdar (1):
intel_th: Use the correct style for SPDX License Identifier
drivers/hwtracing/intel_th/msu.h | 2 +-
drivers/hwtracing/intel_th/pci.c | 10 ++++++++++
drivers/hwtracing/intel_th/pti.h | 2 +-
drivers/hwtracing/stm/core.c | 1 -
4 files changed, 12 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread