Skip to content

Commit b20909f

Browse files
anoevergregkh
authored andcommitted
thunderbolt: Fix double free of drom buffer
commit 2ffa9a5d76a75abbc1f95c17959fced666095bdd upstream. 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: 343fcb8 ("thunderbolt: Fix nontrivial endpoint devices.") Signed-off-by: Andreas Noever <andreas.noever@gmail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Lukas Wunner <lukas@wunner.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a038701 commit b20909f

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

drivers/thunderbolt/eeprom.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ int tb_drom_read(struct tb_switch *sw)
444444
return tb_drom_parse_entries(sw);
445445
err:
446446
kfree(sw->drom);
447+
sw->drom = NULL;
447448
return -EIO;
448449

449450
}

0 commit comments

Comments
 (0)