Commit 8d6d97ab authored by Tadeusz Struk's avatar Tadeusz Struk Committed by Greg Kroah-Hartman

IB/hfi1: Protect the global dev_cntr_names and port_cntr_names

commit 62eed66e upstream.

Protect the global dev_cntr_names and port_cntr_names with the global
mutex as they are allocated and freed in a function called per device.
Otherwise there is a danger of double free and memory leaks.

Fixes: Commit b7481944 ("IB/hfi1: Show statistics counters under IB stats interface")
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarEaswar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7705859
...@@ -1524,6 +1524,7 @@ static const char * const driver_cntr_names[] = { ...@@ -1524,6 +1524,7 @@ static const char * const driver_cntr_names[] = {
"DRIVER_EgrHdrFull" "DRIVER_EgrHdrFull"
}; };
static DEFINE_MUTEX(cntr_names_lock); /* protects the *_cntr_names bufers */
static const char **dev_cntr_names; static const char **dev_cntr_names;
static const char **port_cntr_names; static const char **port_cntr_names;
static int num_driver_cntrs = ARRAY_SIZE(driver_cntr_names); static int num_driver_cntrs = ARRAY_SIZE(driver_cntr_names);
...@@ -1578,6 +1579,7 @@ static struct rdma_hw_stats *alloc_hw_stats(struct ib_device *ibdev, ...@@ -1578,6 +1579,7 @@ static struct rdma_hw_stats *alloc_hw_stats(struct ib_device *ibdev,
{ {
int i, err; int i, err;
mutex_lock(&cntr_names_lock);
if (!cntr_names_initialized) { if (!cntr_names_initialized) {
struct hfi1_devdata *dd = dd_from_ibdev(ibdev); struct hfi1_devdata *dd = dd_from_ibdev(ibdev);
...@@ -1586,8 +1588,10 @@ static struct rdma_hw_stats *alloc_hw_stats(struct ib_device *ibdev, ...@@ -1586,8 +1588,10 @@ static struct rdma_hw_stats *alloc_hw_stats(struct ib_device *ibdev,
num_driver_cntrs, num_driver_cntrs,
&num_dev_cntrs, &num_dev_cntrs,
&dev_cntr_names); &dev_cntr_names);
if (err) if (err) {
mutex_unlock(&cntr_names_lock);
return NULL; return NULL;
}
for (i = 0; i < num_driver_cntrs; i++) for (i = 0; i < num_driver_cntrs; i++)
dev_cntr_names[num_dev_cntrs + i] = dev_cntr_names[num_dev_cntrs + i] =
...@@ -1601,10 +1605,12 @@ static struct rdma_hw_stats *alloc_hw_stats(struct ib_device *ibdev, ...@@ -1601,10 +1605,12 @@ static struct rdma_hw_stats *alloc_hw_stats(struct ib_device *ibdev,
if (err) { if (err) {
kfree(dev_cntr_names); kfree(dev_cntr_names);
dev_cntr_names = NULL; dev_cntr_names = NULL;
mutex_unlock(&cntr_names_lock);
return NULL; return NULL;
} }
cntr_names_initialized = 1; cntr_names_initialized = 1;
} }
mutex_unlock(&cntr_names_lock);
if (!port_num) if (!port_num)
return rdma_alloc_hw_stats_struct( return rdma_alloc_hw_stats_struct(
...@@ -1823,9 +1829,13 @@ void hfi1_unregister_ib_device(struct hfi1_devdata *dd) ...@@ -1823,9 +1829,13 @@ void hfi1_unregister_ib_device(struct hfi1_devdata *dd)
del_timer_sync(&dev->mem_timer); del_timer_sync(&dev->mem_timer);
verbs_txreq_exit(dev); verbs_txreq_exit(dev);
mutex_lock(&cntr_names_lock);
kfree(dev_cntr_names); kfree(dev_cntr_names);
kfree(port_cntr_names); kfree(port_cntr_names);
dev_cntr_names = NULL;
port_cntr_names = NULL;
cntr_names_initialized = 0; cntr_names_initialized = 0;
mutex_unlock(&cntr_names_lock);
} }
void hfi1_cnp_rcv(struct hfi1_packet *packet) void hfi1_cnp_rcv(struct hfi1_packet *packet)
......
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