diff options
| author | Andreas Noever <andreas.noever@gmail.com> | 2016-04-10 12:48:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-01 12:17:03 -0700 |
| commit | 11d853be8ade548d68241ca2342addf1514c4b18 (patch) | |
| tree | 1ecdae2354ca20a217204e9713251f1507a66efe | |
| parent | f131e8e07c4ff651a4a2508b9f2cc3a52708b9ab (diff) | |
| download | linux-stable-11d853be8ade548d68241ca2342addf1514c4b18.tar.gz linux-stable-11d853be8ade548d68241ca2342addf1514c4b18.tar.bz2 linux-stable-11d853be8ade548d68241ca2342addf1514c4b18.zip | |
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: 343fcb8c70d7 ("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>
| -rw-r--r-- | drivers/thunderbolt/eeprom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thunderbolt/eeprom.c b/drivers/thunderbolt/eeprom.c index 0dde34e3a7c5..545c60c826a1 100644 --- a/drivers/thunderbolt/eeprom.c +++ b/drivers/thunderbolt/eeprom.c @@ -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; } |