Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org,
	Takashi Iwai <tiwai@suse.com>, Armijn Hemel <armijn@tjaldur.nl>,
	Allison Randal <allison@lohutok.net>
Subject: Re: [PATCH] ALSA: isa/wavefront: prevent out of bounds write in ioctl
Date: Fri, 01 May 2020 12:27:10 +0200
Message-ID: <s5himhghrwh.wl-tiwai@suse.de> (raw)
In-Reply-To: <20200501094011.GA960082@mwanda>

On Fri, 01 May 2020 11:40:11 +0200,
Dan Carpenter wrote:
> 
> The "header->number" comes from the ioctl and it needs to be clamped to
> prevent out of bounds writes.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied now.  Thanks.


Takashi

> ---
> This code predates git.
> 
>  sound/isa/wavefront/wavefront_synth.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
> index c5b1d5900eed2..d6420d224d097 100644
> --- a/sound/isa/wavefront/wavefront_synth.c
> +++ b/sound/isa/wavefront/wavefront_synth.c
> @@ -1171,7 +1171,10 @@ wavefront_send_alias (snd_wavefront_t *dev, wavefront_patch_info *header)
>  				      "alias for %d\n",
>  				      header->number,
>  				      header->hdr.a.OriginalSample);
> -    
> +
> +	if (header->number >= WF_MAX_SAMPLE)
> +		return -EINVAL;
> +
>  	munge_int32 (header->number, &alias_hdr[0], 2);
>  	munge_int32 (header->hdr.a.OriginalSample, &alias_hdr[2], 2);
>  	munge_int32 (*((unsigned int *)&header->hdr.a.sampleStartOffset),
> @@ -1202,6 +1205,9 @@ wavefront_send_multisample (snd_wavefront_t *dev, wavefront_patch_info *header)
>  	int num_samples;
>  	unsigned char *msample_hdr;
>  
> +	if (header->number >= WF_MAX_SAMPLE)
> +		return -EINVAL;
> +
>  	msample_hdr = kmalloc(WF_MSAMPLE_BYTES, GFP_KERNEL);
>  	if (! msample_hdr)
>  		return -ENOMEM;
> -- 
> 2.26.2
> 

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-01  9:40 Dan Carpenter
2020-05-01 10:27 ` Takashi Iwai [this message]

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=s5himhghrwh.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=allison@lohutok.net \
    --cc=alsa-devel@alsa-project.org \
    --cc=armijn@tjaldur.nl \
    --cc=dan.carpenter@oracle.com \
    --cc=kernel-janitors@vger.kernel.org \
    --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

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git