Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b20909f1 authored by Andreas Noever's avatar Andreas Noever Committed by Greg Kroah-Hartman
Browse files

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: 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: Lukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0387018

drivers/thunderbolt/eeprom.c

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ int tb_drom_read(struct tb_switch *sw) 
	return tb_drom_parse_entries(sw);

err:

	kfree(sw->drom);

	sw->drom = NULL;

	return -EIO;



}