lkml.org 
[lkml]   [2021]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 27/71] ALSA: firewire-lib: fix check for the size of isochronous packet payload
    Date
    From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

    commit 395f41e2cdac63e7581fb9574e5ac0f02556e34a upstream.

    The check for size of isochronous packet payload just cares of the size of
    IR context payload without the size of CIP header.

    Cc: <stable@vger.kernel.org>
    Fixes: f11453c7cc01 ("ALSA: firewire-lib: use 16 bytes IR context header to separate CIP header")
    Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
    Link: https://lore.kernel.org/r/20210513125652.110249-4-o-takashi@sakamocchi.jp
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/firewire/amdtp-stream.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/sound/firewire/amdtp-stream.c
    +++ b/sound/firewire/amdtp-stream.c
    @@ -617,18 +617,24 @@ static int parse_ir_ctx_header(struct am
    unsigned int *syt, unsigned int index)
    {
    const __be32 *cip_header;
    + unsigned int cip_header_size;
    int err;

    *payload_length = be32_to_cpu(ctx_header[0]) >> ISO_DATA_LENGTH_SHIFT;
    - if (*payload_length > s->ctx_data.tx.ctx_header_size +
    - s->ctx_data.tx.max_ctx_payload_length) {
    +
    + if (!(s->flags & CIP_NO_HEADER))
    + cip_header_size = 8;
    + else
    + cip_header_size = 0;
    +
    + if (*payload_length > cip_header_size + s->ctx_data.tx.max_ctx_payload_length) {
    dev_err(&s->unit->device,
    "Detect jumbo payload: %04x %04x\n",
    - *payload_length, s->ctx_data.tx.max_ctx_payload_length);
    + *payload_length, cip_header_size + s->ctx_data.tx.max_ctx_payload_length);
    return -EIO;
    }

    - if (!(s->flags & CIP_NO_HEADER)) {
    + if (cip_header_size > 0) {
    cip_header = ctx_header + 2;
    err = check_cip_header(s, cip_header, *payload_length,
    data_blocks, data_block_counter, syt);

    \
     
     \ /
      Last update: 2021-05-24 17:56    [W:4.128 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site