[PATCH stable] b43legacy: Fix possible NULL pointer dereference in DMA code

[PATCH stable] b43legacy: Fix possible NULL pointer dereference in DMA code

[Michael Buesch]

This fixes a possible NULL pointer dereference in an error path of the
DMA allocation error checking code.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

---

This patch is not merged to an upstream tree, yet, but is sent to John.


Index: linux-2.6.25.6/drivers/net/wireless/b43legacy/dma.c
===================================================================
--- linux-2.6.25.6.orig/drivers/net/wireless/b43legacy/dma.c	2008-06-14 22:41:44.000000000 +0200
+++ linux-2.6.25.6/drivers/net/wireless/b43legacy/dma.c	2008-06-20 11:42:20.000000000 +0200
@@ -873,12 +873,13 @@ struct b43legacy_dmaring *b43legacy_setu
 	dma_addr_t dma_test;
 
 	ring = kzalloc(sizeof(*ring), GFP_KERNEL);
 	if (!ring)
 		goto out;
 	ring->type = type;
+	ring->dev = dev;
 
 	nr_slots = B43legacy_RXRING_SLOTS;
 	if (for_tx)
 		nr_slots = B43legacy_TXRING_SLOTS;
 
 	ring->meta = kcalloc(nr_slots, sizeof(struct b43legacy_dmadesc_meta),
@@ -919,13 +920,12 @@ struct b43legacy_dmaring *b43legacy_setu
 
 		dma_unmap_single(dev->dev->dma_dev,
 				 dma_test, sizeof(struct b43legacy_txhdr_fw3),
 				 DMA_TO_DEVICE);
 	}
 
-	ring->dev = dev;
 	ring->nr_slots = nr_slots;
 	ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index);
 	ring->index = controller_index;
 	if (type == B43legacy_DMA_64BIT)
 		ring->ops = &dma64_ops;
 	else

Re: [stable] [PATCH stable] b43legacy: Fix possible NULL pointer dereference in DMA code

[Greg KH]

On Fri, Jun 20, 2008 at 11:46:12AM +0200, Michael Buesch wrote:
> This fixes a possible NULL pointer dereference in an error path of the
> DMA allocation error checking code.
> 
> Signed-off-by: Michael Buesch <mb@bu3sch.de>
> 
> ---
> 
> This patch is not merged to an upstream tree, yet, but is sent to John.

In the future, if you want patches to get automatically added to stable
when they go into Linus's tree, just add:
	Cc: stable <stable@kernel.org>

to the "Signed-off-by:" area and we will get notified of it at merge
time, so you don't have to resend it after it gets applied.

thanks,

greg k-h

Re: [stable] [PATCH stable] b43legacy: Fix possible NULL pointer dereference in DMA code

[Michael Buesch]

On Sunday 22 June 2008 18:59:59 Greg KH wrote:
> On Fri, Jun 20, 2008 at 11:46:12AM +0200, Michael Buesch wrote:
> > This fixes a possible NULL pointer dereference in an error path of the
> > DMA allocation error checking code.
> > 
> > Signed-off-by: Michael Buesch <mb@bu3sch.de>
> > 
> > ---
> > 
> > This patch is not merged to an upstream tree, yet, but is sent to John.
> 
> In the future, if you want patches to get automatically added to stable
> when they go into Linus's tree, just add:
> 	Cc: stable <stable@kernel.org>
> 
> to the "Signed-off-by:" area and we will get notified of it at merge
> time, so you don't have to resend it after it gets applied.

Ok, however often enough it is not trivial to port patches from head to stable.
A bug introduced by a stable port isn't something we really want to risk, I
think. So I'd like to test all stable patches in their final state before they
get submitted to stable.
So for this trivial patch I could probably have used the CC magic, however.

-- 
Greetings Michael.