/* * helpers for managing a buffer for many packets * * Copyright (c) Clemens Ladisch * Licensed under the terms of the GNU General Public License, version 2. */ #include #include #include #include "packets-buffer.h" /** * iso_packets_buffer_init - allocates the memory for packets * @b: the buffer structure to initialize * @unit: the device at the other end of the stream * @count: the number of packets * @packet_size: the (maximum) size of a packet, in bytes * @direction: %DMA_TO_DEVICE or %DMA_FROM_DEVICE */ int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit, unsigned int count, unsigned int packet_size, enum dma_data_direction direction) { unsigned int packets_per_page, pages; unsigned int i, page_index, offset_in_page; void *p; int err; b->packets = kmalloc(count * sizeof(*b->packets), GFP_KERNEL); if (!b->packets) { err = -ENOMEM; goto error; } packet_size = L1_CACHE_ALIGN(packet_size); packets_per_page = PAGE_SIZE / packet_size; if (WARN_ON(!packets_per_page)) { err = -EINVAL; goto error; } pages = DIV_ROUND_UP(count, packets_per_page); err = fw_iso_buffer_init(&b->iso_buffer, fw_parent_device(unit)->card, pages, direction); if (err < 0) goto err_packets; for (i = 0; i < count; ++i) { page_index = i / packets_per_page; p = page_address(b->iso_buffer.pages[page_index]); offset_in_page = (i % packets_per_page) * packet_size; b->packets[i].buffer = p + offset_in_page; b->packets[i].offset = page_index * PAGE_SIZE + offset_in_page; } return 0; err_packets: kfree(b->packets); error: return err; } EXPORT_SYMBOL(iso_packets_buffer_init); /** * iso_packets_buffer_destroy - frees packet buffer resources * @b: the buffer structure to free * @unit: the device at the other end of the stream */ void iso_packets_buffer_destroy(struct iso_packets_buffer *b, struct fw_unit *unit) { fw_iso_buffer_destroy(&b->iso_buffer, fw_parent_device(unit)->card); kfree(b->packets); } EXPORT_SYMBOL(iso_packets_buffer_destroy); ea4a9b81f6a864c10a7cb0b96458df5310a3'/>
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-06 15:09:48 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-06 15:09:48 +0100
commit37a7ea4a9b81f6a864c10a7cb0b96458df5310a3 (patch)
tree11144552593b9656fa4cad7bde945e5bb1a5ad4a
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff)
ALSA: seq: Don't handle loop timeout at snd_seq_pool_done()
snd_seq_pool_done() syncs with closing of all opened threads, but it aborts the wait loop with a timeout, and proceeds to the release resource even if not all threads have been closed. The timeout was 5 seconds, and if you run a crazy stuff, it can exceed easily, and may result in the access of the invalid memory address -- this is what syzkaller detected in a bug report. As a fix, let the code graduate from naiveness, simply remove the loop timeout. BugLink: http://lkml.kernel.org/r/CACT4Y+YdhDV2H5LLzDTJDVF-qiYHUHhtRaW4rbb4gUhTCQB81w@mail.gmail.com Reported-by: Dmitry Vyukov <dvyukov@google.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/core/seq/seq_memory.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c