diff options
| author |   Sebastian Sanchez <sebastian.sanchez@intel.com> | 2018-05-01 05:36:06 -0700 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2018-05-03 15:24:48 -0400 |
| commit | e9777ad4399c26c70318c4945f94efac2ed95391 (patch) | |
| tree | fd73bf21fcef7c7c9321aa3041141fb822080af2 /drivers/infiniband/hw/hfi1/qsfp.c | |
| parent | IB/hfi1: Fix NULL pointer dereference when invalid num_vls is used (diff) | |
| download | linux-dev-e9777ad4399c26c70318c4945f94efac2ed95391.tar.xz linux-dev-e9777ad4399c26c70318c4945f94efac2ed95391.zip | |
IB/{hfi1, rdmavt}: Fix memory leak in hfi1_alloc_devdata() upon failure
When allocating device data, if there's an allocation failure, the
already allocated memory won't be freed such as per-cpu counters.
Fix memory leaks in exception path by creating a common reentrant
clean up function hfi1_clean_devdata() to be used at driver unload
time and device data allocation failure.
To accomplish this, free_platform_config() and clean_up_i2c() are
changed to be reentrant to remove dependencies when they are called
in different order. This helps avoid NULL pointer dereferences
introduced by this patch if those two functions weren't reentrant.
In addition, set dd->int_counter, dd->rcv_limit,
dd->send_schedule and dd->tx_opstats to NULL after they're freed in
hfi1_clean_devdata(), so that hfi1_clean_devdata() is fully reentrant.
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/qsfp.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/qsfp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/hfi1/qsfp.c b/drivers/infiniband/hw/hfi1/qsfp.c index 1869f639c3ae..b5966991d647 100644 --- a/drivers/infiniband/hw/hfi1/qsfp.c +++ b/drivers/infiniband/hw/hfi1/qsfp.c @@ -204,6 +204,8 @@ static void clean_i2c_bus(struct hfi1_i2c_bus *bus) void clean_up_i2c(struct hfi1_devdata *dd, struct hfi1_asic_data *ad) { + if (!ad) + return; clean_i2c_bus(ad->i2c_bus0); ad->i2c_bus0 = NULL; clean_i2c_bus(ad->i2c_bus1); |