linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Marek Vasut <marex@denx.de>,
	linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] iio: mxs-lradc: fix buffer overflow
Date: Sat, 18 Jan 2014 11:31:21 +0000	[thread overview]
Message-ID: <52DA6609.50009@kernel.org> (raw)
In-Reply-To: <1389628923-8689-2-git-send-email-alexandre.belloni@free-electrons.com>

On 13/01/14 16:02, Alexandre Belloni wrote:
> Fixes:
> drivers/staging/iio/adc/mxs-lradc.c:1556 mxs_lradc_probe() error: buffer
> overflow 'iio->channels' 15 <= 15
>
> The reported available scales for in_voltage15 were also wrong.
>
> The realbits lookup is not necessary as all the channels of the LRADC have the
> same resolution, use LRADC_RESOLUTION instead.
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Applied to the fixes-for-3.14new branch of iio.git.  This will go upstream
after 3.14-rc1 is tagged.

It's a little clunky having a simple array some of which isn't used for these
but I guess it does give fairly simple code.

Thanks,
> ---
>   drivers/staging/iio/adc/mxs-lradc.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
> index df71669bb60e..aa86849daeba 100644
> --- a/drivers/staging/iio/adc/mxs-lradc.c
> +++ b/drivers/staging/iio/adc/mxs-lradc.c
> @@ -1613,7 +1613,7 @@ static int mxs_lradc_probe(struct platform_device *pdev)
>   			 * of the array.
>   			 */
>   			scale_uv = ((u64)lradc->vref_mv[i] * 100000000) >>
> -				   (iio->channels[i].scan_type.realbits - s);
> +				   (LRADC_RESOLUTION - s);
>   			lradc->scale_avail[i][s].nano =
>   					do_div(scale_uv, 100000000) * 10;
>   			lradc->scale_avail[i][s].integer = scale_uv;
>

  reply	other threads:[~2014-01-18 11:31 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-13 16:02 [PATCH 0/3] iio: mxs-lradc fixes Alexandre Belloni
2014-01-13 16:02 ` [PATCH 1/3] iio: mxs-lradc: fix buffer overflow Alexandre Belloni
2014-01-18 11:31   ` Jonathan Cameron [this message]
2014-01-13 16:02 ` [PATCH 2/3] iio: mxs-lradc: fix invalid channel number detection Alexandre Belloni
2014-01-13 20:25   ` Marek Vasut
2014-01-13 23:43     ` Alexandre Belloni
2014-01-14 18:52       ` Jonathan Cameron
2014-01-13 16:02 ` [PATCH 3/3] iio: mxs-lradc: remove useless scale_available files Alexandre Belloni
2014-01-18 11:32   ` Jonathan Cameron

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=52DA6609.50009@kernel.org \
    --to=jic23@kernel.org \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marex@denx.de \
    /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).