Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f9ec47d authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43legacy: Fix possible NULL pointer dereference in DMA code 



This fixes a possible NULL pointer dereference in an error path of the
DMA allocation error checking code. This is also necessary for a future
DMA API change that is on its way into the mainline kernel that adds
an additional dev parameter to dma_mapping_error().

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7b3abfc8

drivers/net/wireless/b43legacy/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, 
	if (!ring)

		goto out;

	ring->type = type;

	ring->dev = dev;



	nr_slots = B43legacy_RXRING_SLOTS;

	if (for_tx)
@@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, 
				 DMA_TO_DEVICE);

	}



	ring->dev = dev;

	ring->nr_slots = nr_slots;

	ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index);

	ring->index = controller_index;