Commit 2ffa9a5d authored by Andreas Noever's avatar Andreas Noever Committed by Bjorn Helgaas

thunderbolt: Fix double free of drom buffer

If tb_drom_read() fails, sw->drom is freed but not set to NULL.  sw->drom
is then freed again in the error path of tb_switch_alloc().

The bug can be triggered by unplugging a thunderbolt device shortly after
it is detected by the thunderbolt driver.

Clear sw->drom if tb_drom_read() fails.

[bhelgaas: add Fixes:, stable versions of interest]
Fixes: 343fcb8c ("thunderbolt: Fix nontrivial endpoint devices.")
Signed-off-by: default avatarAndreas Noever <andreas.noever@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# v3.17+
CC: Lukas Wunner <lukas@wunner.de>
parent 19bf4d4f
...@@ -449,6 +449,7 @@ int tb_drom_read(struct tb_switch *sw) ...@@ -449,6 +449,7 @@ int tb_drom_read(struct tb_switch *sw)
return tb_drom_parse_entries(sw); return tb_drom_parse_entries(sw);
err: err:
kfree(sw->drom); kfree(sw->drom);
sw->drom = NULL;
return -EIO; return -EIO;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment