From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Clemens Ladisch <clemens@ladisch.de>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] ALSA: firewire-lib: fix error codes for allocation failure
Date: Sun, 6 Jun 2021 09:26:04 +0900 [thread overview]
Message-ID: <20210606002604.GA4284@workstation> (raw)
In-Reply-To: <YLtyL4VoArwVLor1@mwanda>
Hi,
On Sat, Jun 05, 2021 at 03:46:39PM +0300, Dan Carpenter wrote:
> Return -ENOMEM if kcalloc() fails. Currently the code returns success.
>
> Fixes: f9e5ecdfc2c2 ("ALSA: firewire-lib: add replay target to cache sequence of packet")
> Fixes: 6f24bb8a157c ("ALSA: firewire-lib: pool sequence of packet in IT context independently")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> sound/firewire/amdtp-stream.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
> index 945597ffacc2..b37cec3cc579 100644
> --- a/sound/firewire/amdtp-stream.c
> +++ b/sound/firewire/amdtp-stream.c
> @@ -1625,8 +1625,10 @@ static int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed,
> s->ctx_data.tx.cache.tail = 0;
> s->ctx_data.tx.cache.descs = kcalloc(s->ctx_data.tx.cache.size,
> sizeof(*s->ctx_data.tx.cache.descs), GFP_KERNEL);
> - if (!s->ctx_data.tx.cache.descs)
> + if (!s->ctx_data.tx.cache.descs) {
> + err = -ENOMEM;
> goto err_context;
> + }
> }
> } else {
> static const struct {
> @@ -1643,8 +1645,10 @@ static int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed,
> };
>
> s->ctx_data.rx.seq.descs = kcalloc(queue_size, sizeof(*s->ctx_data.rx.seq.descs), GFP_KERNEL);
> - if (!s->ctx_data.rx.seq.descs)
> + if (!s->ctx_data.rx.seq.descs) {
> + err = -ENOMEM;
> goto err_context;
> + }
> s->ctx_data.rx.seq.size = queue_size;
> s->ctx_data.rx.seq.tail = 0;
> s->ctx_data.rx.seq.head = 0;
> --
> 2.30.2
Indeed... Nice to catch it.
Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Thanks
Takashi Sakamoto.
next prev parent reply other threads:[~2021-06-06 0:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 12:46 [PATCH] ALSA: firewire-lib: fix error codes for allocation failure Dan Carpenter
2021-06-06 0:26 ` Takashi Sakamoto [this message]
2021-06-06 8:05 ` 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=20210606002604.GA4284@workstation \
--to=o-takashi@sakamocchi.jp \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).