hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2008-04-01 11:46:14 -07:00
parent 10027471a3 6b84236d37
commit 670e23ceb1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/firewire/fw-ohci.c
View File

@ -401,7 +401,8 @@ static void ar_context_tasklet(unsigned long data)
if (d->res_count == 0) { if (d->res_count == 0) {
size_t size, rest, offset; size_t size, rest, offset;
dma_addr_t buffer_bus; dma_addr_t start_bus;
void *start;
/* /*
* This descriptor is finished and we may have a * This descriptor is finished and we may have a
@ -410,9 +411,9 @@ static void ar_context_tasklet(unsigned long data)
*/ */
offset = offsetof(struct ar_buffer, data); offset = offsetof(struct ar_buffer, data);
buffer_bus = le32_to_cpu(ab->descriptor.data_address) - offset; start = buffer = ab;
start_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
buffer = ab;
ab = ab->next; ab = ab->next;
d = &ab->descriptor; d = &ab->descriptor;
size = buffer + PAGE_SIZE - ctx->pointer; size = buffer + PAGE_SIZE - ctx->pointer;
@ -427,7 +428,7 @@ static void ar_context_tasklet(unsigned long data)
buffer = handle_ar_packet(ctx, buffer); buffer = handle_ar_packet(ctx, buffer);
dma_free_coherent(ohci->card.device, PAGE_SIZE, dma_free_coherent(ohci->card.device, PAGE_SIZE,
buffer, buffer_bus); start, start_bus);
ar_context_add_page(ctx); ar_context_add_page(ctx);
} else { } else {
buffer = ctx->pointer; buffer = ctx->pointer;