| Message ID | 1433515647-28059-1-git-send-email-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Acked-By: Devesh Sharma <devesh.sharma@avagotech.com> On Fri, Jun 5, 2015 at 8:17 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > A reorganisation of the PD allocation and deallocation in commit > 9ba1377daa ("RDMA/ocrdma: Move PD resource management to driver.") > introduced a double free on pd, as detected by static analysis by > smatch: > > drivers/infiniband/hw/ocrdma/ocrdma_verbs.c:682 ocrdma_alloc_pd() > error: double free of 'pd'^ > > The original call to ocrdma_mbx_dealloc_pd() (which does not kfree > pd) was replaced with a call to _ocrdma_dealloc_pd() (which does > kfree pd). The kfree following this call causes the double free, > so just remove it to fix the problem. > > Fixes: 9ba1377daa ("RDMA/ocrdma: Move PD resource management to driver.") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > index 9dcb660..219f212 100644 > --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > @@ -679,7 +679,6 @@ err: > ocrdma_release_ucontext_pd(uctx); > } else { > status = _ocrdma_dealloc_pd(dev, pd); > - kfree(pd); > } > exit: > return ERR_PTR(status); > -- > 2.1.4 > -- 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 Fri, 2015-06-05 at 15:47 +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > A reorganisation of the PD allocation and deallocation in commit > 9ba1377daa ("RDMA/ocrdma: Move PD resource management to driver.") > introduced a double free on pd, as detected by static analysis by > smatch: > > drivers/infiniband/hw/ocrdma/ocrdma_verbs.c:682 ocrdma_alloc_pd() > error: double free of 'pd'^ > > The original call to ocrdma_mbx_dealloc_pd() (which does not kfree > pd) was replaced with a call to _ocrdma_dealloc_pd() (which does > kfree pd). The kfree following this call causes the double free, > so just remove it to fix the problem. > > Fixes: 9ba1377daa ("RDMA/ocrdma: Move PD resource management to driver.") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > index 9dcb660..219f212 100644 > --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > @@ -679,7 +679,6 @@ err: > ocrdma_release_ucontext_pd(uctx); > } else { > status = _ocrdma_dealloc_pd(dev, pd); > - kfree(pd); > } > exit: > return ERR_PTR(status); Thanks, applied.
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 9dcb660..219f212 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -679,7 +679,6 @@ err: ocrdma_release_ucontext_pd(uctx); } else { status = _ocrdma_dealloc_pd(dev, pd); - kfree(pd); } exit: return ERR_PTR(status);