diff options
| author | Kees Cook <[email protected]> | 2021-06-21 12:01:01 -0700 |
|---|---|---|
| committer | Kees Cook <[email protected]> | 2021-09-25 08:20:47 -0700 |
| commit | 0e17ad87645cecbea32c8d3d132cdf37532cdefc (patch) | |
| tree | 2cf70feeabe9de71328f650f5ec8d76d101d75c8 | |
| parent | 3d0107a7fee40402f0a3a325604bcbbc47597b5a (diff) | |
powerpc: Split memset() to avoid multi-field overflow
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.
Instead of writing across a field boundary with memset(), move the call
to just the array, and an explicit zeroing of the prior field.
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Qinglang Miao <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Hulk Robot <[email protected]>
Cc: Wang Wensheng <[email protected]>
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
Reviewed-by: Michael Ellerman <[email protected]>
Link: https://lore.kernel.org/lkml/[email protected]
| -rw-r--r-- | drivers/macintosh/smu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index fe63d5ee201b..d33913d523c1 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -848,7 +848,8 @@ int smu_queue_i2c(struct smu_i2c_cmd *cmd) cmd->read = cmd->info.devaddr & 0x01; switch(cmd->info.type) { case SMU_I2C_TRANSFER_SIMPLE: - memset(&cmd->info.sublen, 0, 4); + cmd->info.sublen = 0; + memset(cmd->info.subaddr, 0, sizeof(cmd->info.subaddr)); break; case SMU_I2C_TRANSFER_COMBINED: cmd->info.devaddr &= 0xfe; |