s390 updates for 5.14-rc7
Vasily Gorbik
maintainerHello Linus,
please pull s390 fix for 5.14-rc7.
Thank you,
Vasily
The following changes since commit 7c60610d476766e128cc4284bb6349732cbd6606:
Linux 5.14-rc6 (2021-08-15 13:40:53 -1000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.14-5
for you to fetch changes up to 2a671f77ee49f3e78997b77fdee139467ff6a598:
s390/pci: fix use after free of zpci_dev (2021-08-18 10:12:42 +0200)
----------------------------------------------------------------
s390 updates for 5.14-rc7
- fix use after free of zpci_dev in pci code
----------------------------------------------------------------
Niklas Schnelle (1):
s390/pci: fix use after free of zpci_dev
arch/s390/pci/pci.c | 6 ++++++ arch/s390/pci/pci_bus.h | 5 +++++ 2 files changed, 11 insertions(+)
arch/s390/pci/pci.c +6 -0
@@ -560,9 +560,12 @@ static void zpci_cleanup_bus_resources(struct zpci_dev *zdev)int pcibios_add_device (struct pci_dev *pdev) { +struct zpci_dev *zdev =to_zpci (pdev);struct resource *res;int i; +/* The pdev has a reference to the zdev via its bus */ +zpci_zdev_get (zdev);if (pdev->is_physfn) pdev->no_vf_scan =1 ;
@@ -582,7 +585,10 @@ int pcibios_add_device(struct pci_dev *pdev)void pcibios_release_device (struct pci_dev *pdev) { +struct zpci_dev *zdev =to_zpci (pdev); +zpci_unmap_resources (pdev); +zpci_zdev_put (zdev); }int pcibios_enable_device (struct pci_dev *pdev,int mask)
arch/s390/pci/pci_bus.h +5 -0
@@ -22,6 +22,11 @@ static inline void zpci_zdev_put(struct zpci_dev *zdev)kref_put (&zdev->kref, zpci_release_device); } +static inline void zpci_zdev_get (struct zpci_dev *zdev) +{ +kref_get (&zdev->kref); +} +int zpci_alloc_domain (int domain);void zpci_free_domain (int domain); int zpci_setup_bus_resources(struct zpci_dev *zdev,
The pull request you sent on Sat, 21 Aug 2021 11:01:30 +0200:
The pull request you sent on Sat, 21 Aug 2021 11:01:30 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.14-5
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5479a7fe89664b526d21cd62dac5dfe017e0ebd3
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html