From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Yizhuo Zhai <yzhai003@ucr.edu>, Anthony Kim <anthony.kim@hideep.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: hideep - fix the uninitialized use in hideep_nvm_unlock()
Date: Sat, 19 Jun 2021 22:10:37 -0700 [thread overview]
Message-ID: <YM7NzYgEl8NhU36H@google.com> (raw)
In-Reply-To: <CABvMjLRxy1yqXUOWqTTeq=UOsLtuPAyOSCi4SPgcbAqjMuWCCg@mail.gmail.com>
On Wed, Jun 16, 2021 at 03:48:51PM -0700, Yizhuo Zhai wrote:
> Inside function hideep_nvm_unlock(), variable "unmask_code" could
> be uninitialized if hideep_pgm_r_reg() returns error, however, it
> is used in the later if statement after an "and" operation, which
> is potentially unsafe.
I think this is pretty sensible, but let's see if the original author
has some comments...
>
> Signed-off-by: Yizhuo <yzhai003@ucr.edu>
> ---
> drivers/input/touchscreen/hideep.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/touchscreen/hideep.c
> b/drivers/input/touchscreen/hideep.c
> index ddad4a82a5e5..f860a815b603 100644
> --- a/drivers/input/touchscreen/hideep.c
> +++ b/drivers/input/touchscreen/hideep.c
> @@ -364,9 +364,13 @@ static int hideep_enter_pgm(struct hideep_ts *ts)
> static void hideep_nvm_unlock(struct hideep_ts *ts)
> {
> u32 unmask_code;
> + int ret;
>
> hideep_pgm_w_reg(ts, HIDEEP_FLASH_CFG, HIDEEP_NVM_SFR_RPAGE);
> - hideep_pgm_r_reg(ts, 0x0000000C, &unmask_code);
> + ret = hideep_pgm_r_reg(ts, 0x0000000C, &unmask_code);
> + if (ret)
> + return ret;
> +
> hideep_pgm_w_reg(ts, HIDEEP_FLASH_CFG, HIDEEP_NVM_DEFAULT_PAGE);
>
> /* make it unprotected code */
> @@ -462,7 +466,9 @@ static int hideep_program_nvm(struct hideep_ts *ts,
> u32 addr = 0;
> int error;
>
> - hideep_nvm_unlock(ts);
> + error = hideep_nvm_unlock(ts);
> + if (error)
> + return error;
>
> while (ucode_len > 0) {
> xfer_len = min_t(size_t, ucode_len, HIDEEP_NVM_PAGE_SIZE);
> --
> 2.17.1
--
Dmitry
next parent reply other threads:[~2021-06-20 5:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CABvMjLRxy1yqXUOWqTTeq=UOsLtuPAyOSCi4SPgcbAqjMuWCCg@mail.gmail.com>
2021-06-20 5:10 ` Dmitry Torokhov [this message]
2021-06-20 5:26 ` [PATCH] Input: hideep - fix the uninitialized use in hideep_nvm_unlock() Dmitry Torokhov
2021-06-20 5:35 ` Dmitry Torokhov
2021-06-20 6:00 ` Yizhuo Zhai
2021-06-15 17:26 Yizhuo Zhai
2021-06-15 18:15 ` Dmitry Torokhov
2021-06-15 18:57 ` Yizhuo Zhai
2021-06-15 19:41 ` Dmitry Torokhov
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=YM7NzYgEl8NhU36H@google.com \
--to=dmitry.torokhov@gmail.com \
--cc=anthony.kim@hideep.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yzhai003@ucr.edu \
/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.