Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-ohci: plug dma memory leak in AR handler
+5
-4
+5
-4
drivers/firewire/fw-ohci.c
+5
-4
drivers/firewire/fw-ohci.c
···
401
401
402
402
if (d->res_count == 0) {
403
403
size_t size, rest, offset;
404
-
dma_addr_t buffer_bus;
404
+
dma_addr_t start_bus;
405
+
void *start;
405
406
406
407
/*
407
408
* This descriptor is finished and we may have a
···
411
410
*/
412
411
413
412
offset = offsetof(struct ar_buffer, data);
414
-
buffer_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
413
+
start = buffer = ab;
414
+
start_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
415
415
416
-
buffer = ab;
417
416
ab = ab->next;
418
417
d = &ab->descriptor;
419
418
size = buffer + PAGE_SIZE - ctx->pointer;
···
428
427
buffer = handle_ar_packet(ctx, buffer);
429
428
430
429
dma_free_coherent(ohci->card.device, PAGE_SIZE,
431
-
buffer, buffer_bus);
430
+
start, start_bus);
432
431
ar_context_add_page(ctx);
433
432
} else {
434
433
buffer = ctx->pointer;