Messages in this thread | | | Date | Tue, 27 Apr 2021 19:24:38 +0200 | From | Greg Kroah-Hartman <> | Subject | Re: [PATCH 049/190] Revert "agp/intel: Fix a memory leak on module initialisation failure" |
| |
On Wed, Apr 21, 2021 at 02:58:44PM +0200, Greg Kroah-Hartman wrote: > This reverts commit b975abbd382fe442713a4c233549abb90e57c22b. > > Commits from @umn.edu addresses have been found to be submitted in "bad > faith" to try to test the kernel community's ability to review "known > malicious" changes. The result of these submissions can be found in a > paper published at the 42nd IEEE Symposium on Security and Privacy > entitled, "Open Source Insecurity: Stealthily Introducing > Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University > of Minnesota) and Kangjie Lu (University of Minnesota). > > Because of this, all submissions from this group must be reverted from > the kernel tree and will need to be re-reviewed again to determine if > they actually are a valid fix. Until that work is complete, remove this > change to ensure that no problems are being introduced into the > codebase. > > Cc: Qiushi Wu <wu000273@umn.edu> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: https > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > drivers/char/agp/intel-gtt.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c > index 5bfdf222d5f9..4b34a5195c65 100644 > --- a/drivers/char/agp/intel-gtt.c > +++ b/drivers/char/agp/intel-gtt.c > @@ -304,10 +304,8 @@ static int intel_gtt_setup_scratch_page(void) > if (intel_private.needs_dmar) { > dma_addr = pci_map_page(intel_private.pcidev, page, 0, > PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); > - if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) { > - __free_page(page); > + if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) > return -EINVAL; > - } > > intel_private.scratch_page_dma = dma_addr; > } else > -- > 2.31.1 >
Original looks correct, I'll drop this revert.
greg k-h
| |