public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Alan Cox <alan@llwyncelyn.cymru>
To: mchehab@kernel.org, linux-media@vger.kernel.org
Subject: [PATCH 05/11] atomisp2: off by one in atomisp_s_input()
Date: Fri, 26 May 2017 16:28:05 +0100	[thread overview]
Message-ID: <149581248013.17585.510088085248801167.stgit@builder> (raw)
In-Reply-To: <149581243155.17585.8164899156710160858.stgit@builder>

From: Dan Carpenter <dan.carpenter@oracle.com>

The isp->inputs[] array has isp->input_cnt elements which have been
initialized so this > should be >=.

This bug is harmless.  The check against ATOM_ISP_MAX_INPUTS prevents us
from reading beyond the end of the array.  The uninitialized elements
are zeroed out so we will end up returning -EINVAL a few lines later
because the .camera pointer is NULL.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
 .../media/atomisp/pci/atomisp2/atomisp_ioctl.c     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
index 6064bb8..aa0526e 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
@@ -683,7 +683,7 @@ static int atomisp_s_input(struct file *file, void *fh, unsigned int input)
 	int ret;
 
 	rt_mutex_lock(&isp->mutex);
-	if (input >= ATOM_ISP_MAX_INPUTS || input > isp->input_cnt) {
+	if (input >= ATOM_ISP_MAX_INPUTS || input >= isp->input_cnt) {
 		dev_dbg(isp->dev, "input_cnt: %d\n", isp->input_cnt);
 		ret = -EINVAL;
 		goto error;

  parent reply	other threads:[~2017-05-26 15:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-26 15:27 [PATCHv2 01/11] atompisp: HAS_BL is never defined so lose it Alan Cox
2017-05-26 15:27 ` [PATCHv2 02/11] atomisp: remove NUM_OF_BLS Alan Cox
2017-05-26 15:27 ` [PATCHv2 03/11] atomisp2: remove HRT_UNSCHED Alan Cox
2017-05-26 15:27 ` [PATCHv2 04/11] atomisp2: tidy up confused ifdefs Alan Cox
2017-05-26 15:28 ` Alan Cox [this message]
2017-05-26 15:28 ` [PATCHv2 06/11] atomisp: eliminate dead code under HAS_RES_MGR Alan Cox
2017-05-26 15:28 ` [PATCH 07/11] atomisp: unify sh_css_hmm_buffer_record_acquire Alan Cox
2017-05-26 15:29 ` [PATCH 08/11] atomisp: Unify load_preview_binaries for the most part Alan Cox
2017-05-26 15:29 ` [PATCH 09/11] atomisp: Unify lut free logic Alan Cox
2017-05-26 15:29 ` [PATCH 10/11] atomisp: remove sh_css_irq - it contains nothing Alan Cox
2017-05-26 15:29 ` [PATCH 11/11] atomisp: de-duplicate sh_css_mmu_set_page_table_base_index Alan Cox

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=149581248013.17585.510088085248801167.stgit@builder \
    --to=alan@llwyncelyn.cymru \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    /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