OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

thunderbolt: Check that both ports are reachable when allocating path 

Add sanity check that given src and dst ports are reachable through path
walk before allocating a path. If they are not then bail out early.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Mika Westerberg 2020-05-17 10:44:31 +03:00
parent c64c3f3ac6
commit 7e897bb7be
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/thunderbolt/path.c
View File

@ -229,7 +229,7 @@ struct tb_path *tb_path_alloc(struct tb *tb, struct tb_port *src, int src_hopid,
struct tb_port *dst, int dst_hopid, int link_nr, struct tb_port *dst, int dst_hopid, int link_nr,
const char *name) const char *name)
{ {
struct tb_port *in_port, *out_port; struct tb_port *in_port, *out_port, *first_port, *last_port;
int in_hopid, out_hopid; int in_hopid, out_hopid;
struct tb_path *path; struct tb_path *path;
size_t num_hops; size_t num_hops;
@ -239,9 +239,20 @@ struct tb_path *tb_path_alloc(struct tb *tb, struct tb_port *src, int src_hopid,
if (!path) if (!path)
return NULL; return NULL;
first_port = last_port = NULL;
i = 0; i = 0;
tb_for_each_port_on_path(src, dst, in_port) tb_for_each_port_on_path(src, dst, in_port) {
if (!first_port)
first_port = in_port;
last_port = in_port;
i++; i++;
}
/* Check that src and dst are reachable */
if (first_port != src || last_port != dst) {
kfree(path);
return NULL;
}
/* Each hop takes two ports */ /* Each hop takes two ports */
num_hops = i / 2; num_hops = i / 2;