i2c: core-smbus: don't trace smbus_reply data on errors
Subsystems (3)
PATCH v3 1/1 i2c: core-smbus: don't trace smbus_reply data on errors
If an smbus transfer fails, there's no guarantee that the output buffer was written. So, avoid trying to show the output buffer when tracing after an error. This was 'mostly harmless', but would trip up kasan checking if left-over cruft in byte 0 is a large length, causing us to read from unwritten memory.
--- drivers/i2c/i2c-core-smbus.c | 2 +- include/trace/events/smbus.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/i2c-core-smbus.c +1 -1
@@ -585,7 +585,7 @@ s32 __i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, trace:/* If enabled, the reply tracepoint is conditional on read_write. */ trace_smbus_reply (adapter, addr, flags, read_write, - command, protocol, data); + command, protocol, data, res);trace_smbus_result (adapter, addr, flags, read_write, command, protocol, res);
include/trace/events/smbus.h +3 -3
@@ -138,9 +138,9 @@ TRACE_EVENT_CONDITION(smbus_reply, TP_PROTO(const struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, u8 command, int protocol, - const union i2c_smbus_data *data), -TP_ARGS (adap, addr, flags, read_write, command, protocol, data), - TP_CONDITION(read_write == I2C_SMBUS_READ), + const union i2c_smbus_data *data, int res), +TP_ARGS (adap, addr, flags, read_write, command, protocol, data, res), + TP_CONDITION(res >= 0 && read_write == I2C_SMBUS_READ), TP_STRUCT__entry( __field(int, adapter_nr ) __field(__u16, addr )
Signature · 1 line
2.21.0.rc0.258.g878e2cd30e-goog
Quoted 7 lines · On Tue, 12 Feb 2019 19:40:57 -0800 John Sperbeck <[email protected]> wrote:
If an smbus transfer fails, there's no guarantee that the output buffer was written. So, avoid trying to show the output buffer when tracing after an error. This was 'mostly harmless', but would trip up kasan checking if left-over cruft in byte 0 is a large length, causing us to read from unwritten memory.
From a tracing viewpoint:
-- Steve
Quoted 37 lines
Signed-off-by John Sperbeck <[email protected]>--- drivers/i2c/i2c-core-smbus.c | 2 +- include/trace/events/smbus.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/i2c/i2c-core-smbus.c +1
-1@@ -585,7 +585,7 @@ s32 __i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, trace:/* If enabled, the reply tracepoint is conditional on read_write. */ trace_smbus_reply (adapter, addr, flags, read_write, - command, protocol, data); + command, protocol, data, res);trace_smbus_result (adapter, addr, flags, read_write, command, protocol, res);include/trace/events/smbus.h +3
-3@@ -138,9 +138,9 @@ TRACE_EVENT_CONDITION(smbus_reply, TP_PROTO(const struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, u8 command, int protocol, - const union i2c_smbus_data *data), -TP_ARGS (adap, addr, flags, read_write, command, protocol, data), - TP_CONDITION(read_write == I2C_SMBUS_READ), + const union i2c_smbus_data *data, int res), +TP_ARGS (adap, addr, flags, read_write, command, protocol, data, res), + TP_CONDITION(res >= 0 && read_write == I2C_SMBUS_READ), TP_STRUCT__entry( __field(int, adapter_nr ) __field(__u16, addr )
Wolfram Sang
AppliedQuoted 7 lines · John Sperbeck
If an smbus transfer fails, there's no guarantee that the output buffer was written. So, avoid trying to show the output buffer when tracing after an error. This was 'mostly harmless', but would trip up kasan checking if left-over cruft in byte 0 is a large length, causing us to read from unwritten memory.
Signed-off-by John Sperbeck <[email protected]>
Applied to for-next, thanks!