From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: Jia-Ju Bai <baijiaju1990@gmail.com>
Cc: dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org,
tglx@linutronix.de, allison@lohutok.net, rdunlap@infradead.org,
patches@opensource.cirrus.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] input: touchscreen: wm97xx-core: Fix possible null-pointer dereferences in wm97xx_ts_input_open()
Date: Fri, 26 Jul 2019 10:06:26 +0100 [thread overview]
Message-ID: <20190726090626.GA54126@ediswmail.ad.cirrus.com> (raw)
In-Reply-To: <20190726084816.8487-1-baijiaju1990@gmail.com>
On Fri, Jul 26, 2019 at 04:48:16PM +0800, Jia-Ju Bai wrote:
> In wm97xx_ts_input_open(), there is an if statement on line 507 to check
> whether wm->mach_ops is NULL:
> if (wm->mach_ops && wm->mach_ops->acc_enabled)
>
> When wm->mach_ops is NULL, it is used on line 521:
> wm97xx_init_pen_irq(wm);
> BUG_ON(!wm->mach_ops->irq_enable);
> BUG_ON(!wm->mach_ops->irq_gpio);
> wm97xx_reg_write(..., reg & ~(wm->mach_ops->irq_gpio))
>
> Thus, possible null-pointer dereferences may occur.
>
> To fix these bugs, wm->mach_ops is checked before calling
> wm97xx_init_pen_irq().
>
> These bugs found by a static analysis tool STCheck written by us.
>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> ---
> drivers/input/touchscreen/wm97xx-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
> index 0a174bd82915..f7bd0726a577 100644
> --- a/drivers/input/touchscreen/wm97xx-core.c
> +++ b/drivers/input/touchscreen/wm97xx-core.c
> @@ -517,7 +517,7 @@ static int wm97xx_ts_input_open(struct input_dev *idev)
> wm->ts_reader_interval = wm->ts_reader_min_interval;
>
> wm->pen_is_down = 0;
> - if (wm->pen_irq)
> + if (wm->pen_irq && wm->mach_ops)
> wm97xx_init_pen_irq(wm);
> else
> dev_err(wm->dev, "No IRQ specified\n");
This doesn't quite feel like the right fix as it would print an
error message saying "No IRQ specified", in the case the IRQ is
specified but the mach_ops have not been set.
I would suggest either extending the existing BUG_ON or adding a
new check in wm97xx_init_pen_irq.
Thanks,
Charles
> --
> 2.17.0
>
next prev parent reply other threads:[~2019-07-26 9:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 8:48 [PATCH] input: touchscreen: wm97xx-core: Fix possible null-pointer dereferences in wm97xx_ts_input_open() Jia-Ju Bai
2019-07-26 9:06 ` Charles Keepax [this message]
2019-07-26 9:08 ` Jia-Ju Bai
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=20190726090626.GA54126@ediswmail.ad.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=allison@lohutok.net \
--cc=baijiaju1990@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.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).