* [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required
@ 2021-09-14 14:02 Sven Peter
2021-09-14 14:02 ` [PATCH v2 2/3] usb: typec: tipd: Add an additional overflow check Sven Peter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Sven Peter @ 2021-09-14 14:02 UTC (permalink / raw)
To: Heikki Krogerus; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, Sven Peter
tps6598x_block_read/write always read 65 bytes of data even when much
less is required when I2C_FUNC_I2C is used. Reduce this to the correct
number.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
no changes for v2
drivers/usb/typec/tipd/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 21b3ae25c76d..c18ec3785592 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -123,7 +123,7 @@ tps6598x_block_read(struct tps6598x *tps, u8 reg, void *val, size_t len)
if (!tps->i2c_protocol)
return regmap_raw_read(tps->regmap, reg, val, len);
- ret = regmap_raw_read(tps->regmap, reg, data, sizeof(data));
+ ret = regmap_raw_read(tps->regmap, reg, data, len + 1);
if (ret)
return ret;
@@ -145,7 +145,7 @@ static int tps6598x_block_write(struct tps6598x *tps, u8 reg,
data[0] = len;
memcpy(&data[1], val, len);
- return regmap_raw_write(tps->regmap, reg, data, sizeof(data));
+ return regmap_raw_write(tps->regmap, reg, data, len + 1);
}
static inline int tps6598x_read16(struct tps6598x *tps, u8 reg, u16 *val)
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] usb: typec: tipd: Add an additional overflow check
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 ` 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:20 ` [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required Heikki Krogerus
2 siblings, 1 reply; 6+ messages in thread
From: Sven Peter @ 2021-09-14 14:02 UTC (permalink / raw)
To: Heikki Krogerus; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, Sven Peter
tps6598x_block_read already checks for the maximum length of the read
but tps6598x_block_write does not. Add the symmetric check there as
well.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
v1 -> v2:
- removed the WARN_ON to not crash machines running with panic-on-warn
as pointed out by greg k-h
drivers/usb/typec/tipd/core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index c18ec3785592..8c79ba17a157 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -139,6 +139,9 @@ static int tps6598x_block_write(struct tps6598x *tps, u8 reg,
{
u8 data[TPS_MAX_LEN + 1];
+ if (len + 1 > sizeof(data))
+ return -EINVAL;
+
if (!tps->i2c_protocol)
return regmap_raw_write(tps->regmap, reg, val, len);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] usb: typec: tipd: Remove WARN_ON in tps6598x_block_read
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-14 14:02 ` Sven Peter
2021-09-15 7:23 ` Heikki Krogerus
2021-09-15 7:20 ` [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required Heikki Krogerus
2 siblings, 1 reply; 6+ messages in thread
From: Sven Peter @ 2021-09-14 14:02 UTC (permalink / raw)
To: Heikki Krogerus; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, Sven Peter
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required
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-14 14:02 ` [PATCH v2 3/3] usb: typec: tipd: Remove WARN_ON in tps6598x_block_read Sven Peter
@ 2021-09-15 7:20 ` Heikki Krogerus
2 siblings, 0 replies; 6+ messages in thread
From: Heikki Krogerus @ 2021-09-15 7:20 UTC (permalink / raw)
To: Sven Peter; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel
On Tue, Sep 14, 2021 at 04:02:33PM +0200, Sven Peter wrote:
> tps6598x_block_read/write always read 65 bytes of data even when much
> less is required when I2C_FUNC_I2C is used. Reduce this to the correct
> number.
>
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> no changes for v2
>
> drivers/usb/typec/tipd/core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 21b3ae25c76d..c18ec3785592 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -123,7 +123,7 @@ tps6598x_block_read(struct tps6598x *tps, u8 reg, void *val, size_t len)
> if (!tps->i2c_protocol)
> return regmap_raw_read(tps->regmap, reg, val, len);
>
> - ret = regmap_raw_read(tps->regmap, reg, data, sizeof(data));
> + ret = regmap_raw_read(tps->regmap, reg, data, len + 1);
> if (ret)
> return ret;
>
> @@ -145,7 +145,7 @@ static int tps6598x_block_write(struct tps6598x *tps, u8 reg,
> data[0] = len;
> memcpy(&data[1], val, len);
>
> - return regmap_raw_write(tps->regmap, reg, data, sizeof(data));
> + return regmap_raw_write(tps->regmap, reg, data, len + 1);
> }
>
> static inline int tps6598x_read16(struct tps6598x *tps, u8 reg, u16 *val)
> --
> 2.25.1
thanks,
--
heikki
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] usb: typec: tipd: Add an additional overflow check
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
0 siblings, 0 replies; 6+ messages in thread
From: Heikki Krogerus @ 2021-09-15 7:21 UTC (permalink / raw)
To: Sven Peter; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel
On Tue, Sep 14, 2021 at 04:02:34PM +0200, Sven Peter wrote:
> tps6598x_block_read already checks for the maximum length of the read
> but tps6598x_block_write does not. Add the symmetric check there as
> well.
>
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> v1 -> v2:
> - removed the WARN_ON to not crash machines running with panic-on-warn
> as pointed out by greg k-h
>
> drivers/usb/typec/tipd/core.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index c18ec3785592..8c79ba17a157 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -139,6 +139,9 @@ static int tps6598x_block_write(struct tps6598x *tps, u8 reg,
> {
> u8 data[TPS_MAX_LEN + 1];
>
> + if (len + 1 > sizeof(data))
> + return -EINVAL;
> +
> if (!tps->i2c_protocol)
> return regmap_raw_write(tps->regmap, reg, val, len);
>
> --
> 2.25.1
thanks,
--
heikki
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] usb: typec: tipd: Remove WARN_ON in tps6598x_block_read
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
0 siblings, 0 replies; 6+ messages in thread
From: Heikki Krogerus @ 2021-09-15 7:23 UTC (permalink / raw)
To: Sven Peter; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-15 7:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-09-15 7:20 ` [PATCH v2 1/3] usb: typec: tipd: Don't read/write more bytes than required Heikki Krogerus
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).