From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Sven Peter <sven@svenpeter.dev>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/3] usb: typec: tipd: Remove WARN_ON in tps6598x_block_read
Date: Wed, 15 Sep 2021 10:23:04 +0300 [thread overview]
Message-ID: <YUGfWGLlH3q4hkVL@kuha.fi.intel.com> (raw)
In-Reply-To: <20210914140235.65955-3-sven@svenpeter.dev>
On Tue, Sep 14, 2021 at 04:02:35PM +0200, Sven Peter wrote:
> Calling tps6598x_block_read with a higher than allowed len can be
> handled by just returning an error. There's no need to crash systems
> with panic-on-warn enabled.
>
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> v1 -> v2:
> - added this patch to also remove the WARN_ON in tps6598x_block_read
> as suggested by greg k-h
>
> drivers/usb/typec/tipd/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 8c79ba17a157..93e56291f0cf 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -117,7 +117,7 @@ tps6598x_block_read(struct tps6598x *tps, u8 reg, void *val, size_t len)
> u8 data[TPS_MAX_LEN + 1];
> int ret;
>
> - if (WARN_ON(len + 1 > sizeof(data)))
> + if (len + 1 > sizeof(data))
> return -EINVAL;
>
> if (!tps->i2c_protocol)
> --
> 2.25.1
thanks,
--
heikki
next prev parent reply other threads:[~2021-09-15 7:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 14:02 [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required Sven Peter
2021-09-14 14:02 ` [PATCH v2 2/3] usb: typec: tipd: Add an additional overflow check Sven Peter
2021-09-15 7:21 ` Heikki Krogerus
2021-09-14 14:02 ` [PATCH v2 3/3] usb: typec: tipd: Remove WARN_ON in tps6598x_block_read Sven Peter
2021-09-15 7:23 ` Heikki Krogerus [this message]
2021-09-15 7:20 ` [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required Heikki Krogerus
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=YUGfWGLlH3q4hkVL@kuha.fi.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sven@svenpeter.dev \
/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
Powered by JetHome