diff options
| author | Mika Westerberg | 2018-12-30 11:14:46 +0100 |
|---|---|---|
| committer | Mika Westerberg | 2019-04-18 10:18:51 +0200 |
| commit | f0342e757c271e7c6dd5adedfb6e6695c5af52bf (patch) | |
| tree | beaa2c019b14a6f35e3f925a11c6ca78ad139df4 /drivers/thunderbolt/switch.c | |
| parent | thunderbolt: Take domain lock in switch sysfs attribute callbacks (diff) | |
| download | kernel-qcow2-linux-f0342e757c271e7c6dd5adedfb6e6695c5af52bf.tar.gz kernel-qcow2-linux-f0342e757c271e7c6dd5adedfb6e6695c5af52bf.tar.xz kernel-qcow2-linux-f0342e757c271e7c6dd5adedfb6e6695c5af52bf.zip | |
thunderbolt: Do not allocate switch if depth is greater than 6
Maximum depth in Thunderbolt topology is 6 so make sure it is not
possible to allocate switches that exceed the depth limit.
While at it update tb_switch_alloc() to use upper/lower_32_bits()
following tb_switch_alloc_safe_mode().
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/thunderbolt/switch.c')
| -rw-r--r-- | drivers/thunderbolt/switch.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 7fa4ab076404..1e29c06947af 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -1130,10 +1130,16 @@ static int tb_switch_get_generation(struct tb_switch *sw) struct tb_switch *tb_switch_alloc(struct tb *tb, struct device *parent, u64 route) { - int i; - int cap; struct tb_switch *sw; - int upstream_port = tb_cfg_get_upstream_port(tb->ctl, route); + int upstream_port; + int i, cap, depth; + + /* Make sure we do not exceed maximum topology limit */ + depth = tb_route_length(route); + if (depth > TB_SWITCH_MAX_DEPTH) + return NULL; + + upstream_port = tb_cfg_get_upstream_port(tb->ctl, route); if (upstream_port < 0) return NULL; @@ -1150,9 +1156,9 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, struct device *parent, /* configure switch */ sw->config.upstream_port_number = upstream_port; - sw->config.depth = tb_route_length(route); - sw->config.route_lo = route; - sw->config.route_hi = route >> 32; + sw->config.depth = depth; + sw->config.route_hi = upper_32_bits(route); + sw->config.route_lo = lower_32_bits(route); sw->config.enabled = 0; /* initialize ports */ |