diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2022-10-27 03:06:16 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-10-27 10:20:05 +0300 |
| commit | e0ba1a39b8dfe4f005bebdd85daa89e7382e26b7 (patch) | |
| tree | 40c844e9d58d5d9bc1a22d8df15c94a8acb19648 /drivers/video | |
| parent | b3af84383e7abdc5e63435817bb73a268e7c3637 (diff) | |
| download | linux-e0ba1a39b8dfe4f005bebdd85daa89e7382e26b7.tar.xz | |
fbdev/core: Avoid uninitialized read in aperture_remove_conflicting_pci_device()
Return on error directly from the BAR-iterating loop instead of
break+return.
This is actually a cosmetic fix, since it would be highly unusual to
have this called for a PCI device without any memory BARs.
Fixes: 9d69ef183815 ("fbdev/core: Remove remove_conflicting_pci_framebuffers()")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/e75323732bedc46d613d72ecb40f97e3bc75eea8.1666829073.git.mirq-linux@rere.qmqm.pl
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aperture.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c index 9e6bcc03a1a4..41e77de1ea82 100644 --- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -340,12 +340,9 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na size = pci_resource_len(pdev, bar); ret = aperture_remove_conflicting_devices(base, size, primary, name); if (ret) - break; + return ret; } - if (ret) - return ret; - /* * WARNING: Apparently we must kick fbdev drivers before vgacon, * otherwise the vga fbdev driver falls over. |