From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Takashi Iwai <tiwai@suse.com>, alsa-devel@alsa-project.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
linux-kernel@vger.kernel.org, Jaroslav Kysela <perex@perex.cz>
Subject: Re: [RESEND][PATCH] ALSA: info: Fix llseek return value when using callback
Date: Wed, 17 Aug 2022 14:56:05 +0200 [thread overview]
Message-ID: <7324df1d-0424-a589-f7c9-df089a6cbefe@linux.intel.com> (raw)
In-Reply-To: <20220817124924.3974577-1-amadeuszx.slawinski@linux.intel.com>
On 8/17/2022 2:49 PM, Amadeusz Sławiński wrote:
> 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".
>
> 73029e0ff18d ("ALSA: info - Implement common llseek for binary mode")
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
> sound/core/info.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/core/info.c b/sound/core/info.c
> index b8058b341178..0b2f04dcb589 100644
> --- a/sound/core/info.c
> +++ b/sound/core/info.c
> @@ -111,9 +111,9 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
> 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;
> }
>
Doing resend, because I did copy paste mistake when pasting Takashi
email to git command, additionally alsa-devel blocked my previous mail.
I've seen that Cezary already discussed this issue, and it doesn't seem
to be fixed, can this be somehow investigated? I guess we can provide
response we get from server when email fails?
For example lkml accepted both messages just fine...
previous mail:
https://lore.kernel.org/lkml/20220817124642.3974015-1-amadeuszx.slawinski@linux.intel.com/T/#u
and resend:
https://lore.kernel.org/lkml/20220817124924.3974577-1-amadeuszx.slawinski@linux.intel.com/T/#u
WARNING: multiple messages have this Message-ID (diff)
From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Takashi Iwai <tiwai@suse.com>, alsa-devel@alsa-project.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [RESEND][PATCH] ALSA: info: Fix llseek return value when using callback
Date: Wed, 17 Aug 2022 14:56:05 +0200 [thread overview]
Message-ID: <7324df1d-0424-a589-f7c9-df089a6cbefe@linux.intel.com> (raw)
In-Reply-To: <20220817124924.3974577-1-amadeuszx.slawinski@linux.intel.com>
On 8/17/2022 2:49 PM, Amadeusz Sławiński wrote:
> 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".
>
> 73029e0ff18d ("ALSA: info - Implement common llseek for binary mode")
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
> sound/core/info.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/core/info.c b/sound/core/info.c
> index b8058b341178..0b2f04dcb589 100644
> --- a/sound/core/info.c
> +++ b/sound/core/info.c
> @@ -111,9 +111,9 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
> 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;
> }
>
Doing resend, because I did copy paste mistake when pasting Takashi
email to git command, additionally alsa-devel blocked my previous mail.
I've seen that Cezary already discussed this issue, and it doesn't seem
to be fixed, can this be somehow investigated? I guess we can provide
response we get from server when email fails?
For example lkml accepted both messages just fine...
previous mail:
https://lore.kernel.org/lkml/20220817124642.3974015-1-amadeuszx.slawinski@linux.intel.com/T/#u
and resend:
https://lore.kernel.org/lkml/20220817124924.3974577-1-amadeuszx.slawinski@linux.intel.com/T/#u
next prev parent reply other threads:[~2022-08-17 12:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 12:49 [RESEND][PATCH] ALSA: info: Fix llseek return value when using callback Amadeusz Sławiński
2022-08-17 12:49 ` Amadeusz Sławiński
2022-08-17 12:56 ` Amadeusz Sławiński [this message]
2022-08-17 12:56 ` Amadeusz Sławiński
2022-08-17 13:12 ` Takashi Iwai
2022-08-17 13:12 ` Takashi Iwai
2022-08-17 13:38 ` Cezary Rojewski
2022-08-17 13:50 ` Jaroslav Kysela
2022-08-17 13:15 ` Takashi Iwai
2022-08-17 13:15 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7324df1d-0424-a589-f7c9-df089a6cbefe@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=cezary.rojewski@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.