Skip to content

Commit

Permalink
platform/chrome: cros_ec_typec: zero out stale pointers
Browse files Browse the repository at this point in the history
[ Upstream commit 9a8aadc ]

`cros_typec_get_switch_handles` allocates four pointers when obtaining
type-c switch handles. These pointers are all freed if failing to obtain
any of them; therefore, pointers in `port` become stale. The stale
pointers eventually cause use-after-free or double free in later code
paths. Zeroing out all pointer fields after freeing to eliminate these
stale pointers.

Fixes: f28adb4 ("platform/chrome: cros_ec_typec: Register Type C switches")
Fixes: 1a8912c ("platform/chrome: cros_ec_typec: Get retimer handle")
Signed-off-by: Victor Ding <victording@chromium.org>
Acked-by: Prashant Malani <pmalani@chromium.org>
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20221207093924.v2.1.I1864b6a7ee98824118b93677868d22d3750f439b@changeid
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Victor Ding authored and gregkh committed Dec 31, 2022
1 parent 40c73b2 commit 6613f36
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/platform/chrome/cros_ec_typec.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,13 @@ static int cros_typec_get_switch_handles(struct cros_typec_port *port,

role_sw_err:
typec_switch_put(port->ori_sw);
port->ori_sw = NULL;
ori_sw_err:
typec_retimer_put(port->retimer);
port->retimer = NULL;
retimer_sw_err:
typec_mux_put(port->mux);
port->mux = NULL;
mux_err:
return -ENODEV;
}
Expand Down

0 comments on commit 6613f36

Please sign in to comment.