lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 001/158] ALSA: info: Fix llseek return value when using callback
    Date
    From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

    commit 9be080edcca330be4af06b19916c35227891e8bc upstream.

    When using callback there was a flow of

    ret = -EINVAL
    if (callback) {
    offset = callback();
    goto out;
    }
    ...
    offset = some other value in case of no callback;
    ret = offset;
    out:
    return ret;

    which causes the snd_info_entry_llseek() to return -EINVAL when there is
    callback handler. Fix this by setting "ret" directly to callback return
    value before jumping to "out".

    Fixes: 73029e0ff18d ("ALSA: info - Implement common llseek for binary mode")
    Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20220817124924.3974577-1-amadeuszx.slawinski@linux.intel.com
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/core/info.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/sound/core/info.c
    +++ b/sound/core/info.c
    @@ -112,9 +112,9 @@ static loff_t snd_info_entry_llseek(stru
    entry = data->entry;
    mutex_lock(&entry->access);
    if (entry->c.ops->llseek) {
    - offset = entry->c.ops->llseek(entry,
    - data->file_private_data,
    - file, offset, orig);
    + ret = entry->c.ops->llseek(entry,
    + data->file_private_data,
    + file, offset, orig);
    goto out;
    }


    \
     
     \ /
      Last update: 2022-08-23 14:12    [W:4.119 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site