| Message ID | 1465157636-10120-2-git-send-email-sudipm.mukherjee@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Sun, Jun 05, 2016 at 09:13:56PM +0100, Sudip Mukherjee wrote: > If the allocation of hsag fails we were just returning but stats was > not released. > > Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> Thanks, Reviewed-by: Leon Romanovsky <leonro@mellanox.com> > --- > drivers/infiniband/core/sysfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c > index fcf6f9c..8d8732c 100644 > --- a/drivers/infiniband/core/sysfs.c > +++ b/drivers/infiniband/core/sysfs.c > @@ -906,7 +906,7 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port, > sizeof(void *) * (stats->num_counters + 1), > GFP_KERNEL); > if (!hsag) > - return; > + goto err; > > ret = device->get_hw_stats(device, stats, port_num, > stats->num_counters); > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 06, 2016 at 09:34:54AM +0300, Leon Romanovsky wrote: > On Sun, Jun 05, 2016 at 09:13:56PM +0100, Sudip Mukherjee wrote: > > If the allocation of hsag fails we were just returning but stats was > > not released. > > > > Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> > > Thanks, > Reviewed-by: Leon Romanovsky <leonro@mellanox.com> It looks the same as Colin's patch which was sent a week ago. http://marc.info/?l=linux-kernel&m=146480441931189&w=2 > > > --- > > drivers/infiniband/core/sysfs.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c > > index fcf6f9c..8d8732c 100644 > > --- a/drivers/infiniband/core/sysfs.c > > +++ b/drivers/infiniband/core/sysfs.c > > @@ -906,7 +906,7 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port, > > sizeof(void *) * (stats->num_counters + 1), > > GFP_KERNEL); > > if (!hsag) > > - return; > > + goto err; > > > > ret = device->get_hw_stats(device, stats, port_num, > > stats->num_counters); > > -- > > 1.9.1 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6/5/2016 4:13 PM, Sudip Mukherjee wrote: > If the allocation of hsag fails we were just returning but stats was > not released. > > Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> > --- > drivers/infiniband/core/sysfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c > index fcf6f9c..8d8732c 100644 > --- a/drivers/infiniband/core/sysfs.c > +++ b/drivers/infiniband/core/sysfs.c > @@ -906,7 +906,7 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port, > sizeof(void *) * (stats->num_counters + 1), > GFP_KERNEL); > if (!hsag) > - return; > + goto err; > > ret = device->get_hw_stats(device, stats, port_num, > stats->num_counters); > This issue was previously fixed by another patch and is no longer applicable.
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index fcf6f9c..8d8732c 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -906,7 +906,7 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port, sizeof(void *) * (stats->num_counters + 1), GFP_KERNEL); if (!hsag) - return; + goto err; ret = device->get_hw_stats(device, stats, port_num, stats->num_counters);
If the allocation of hsag fails we were just returning but stats was not released. Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> --- drivers/infiniband/core/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)