From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wm0-f68.google.com ([74.125.82.68]:33966 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751870AbcGRMKa (ORCPT ); Mon, 18 Jul 2016 08:10:30 -0400 Received: by mail-wm0-f68.google.com with SMTP id q128so12422337wma.1 for ; Mon, 18 Jul 2016 05:10:29 -0700 (PDT) Date: Mon, 18 Jul 2016 14:10:25 +0200 From: Daniel Vetter To: Chris Wilson Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Joonas Lahtinen , Sumit Semwal , Daniel Vetter , linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: Re: [PATCH] dma-buf: Release module reference on creation failure Message-ID: <20160718121025.GY17101@phenom.ffwll.local> References: <1468840582-21469-1-git-send-email-chris@chris-wilson.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1468840582-21469-1-git-send-email-chris@chris-wilson.co.uk> Sender: linux-media-owner@vger.kernel.org List-ID: On Mon, Jul 18, 2016 at 12:16:22PM +0100, Chris Wilson wrote: > If we fail to create the anon file, we need to remember to release the > module reference on the owner. > > Signed-off-by: Chris Wilson > Reviewed-by: Joonas Lahtinen > Cc: Joonas Lahtinen > Cc: Sumit Semwal > Cc: Daniel Vetter > Cc: linux-media@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: linaro-mm-sig@lists.linaro.org > --- > drivers/dma-buf/dma-buf.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > index 20ce0687b111..ddaee60ae52a 100644 > --- a/drivers/dma-buf/dma-buf.c > +++ b/drivers/dma-buf/dma-buf.c > @@ -334,6 +334,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) > struct reservation_object *resv = exp_info->resv; > struct file *file; > size_t alloc_size = sizeof(struct dma_buf); > + int ret; Not sure this really helps readability, but meh. Will apply to drm-misc, with a cc: stable. -Daniel > > if (!exp_info->resv) > alloc_size += sizeof(struct reservation_object); > @@ -357,8 +358,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) > > dmabuf = kzalloc(alloc_size, GFP_KERNEL); > if (!dmabuf) { > - module_put(exp_info->owner); > - return ERR_PTR(-ENOMEM); > + ret = -ENOMEM; > + goto err_module; > } > > dmabuf->priv = exp_info->priv; > @@ -379,8 +380,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) > file = anon_inode_getfile("dmabuf", &dma_buf_fops, dmabuf, > exp_info->flags); > if (IS_ERR(file)) { > - kfree(dmabuf); > - return ERR_CAST(file); > + ret = PTR_ERR(file); > + goto err_dmabuf; > } > > file->f_mode |= FMODE_LSEEK; > @@ -394,6 +395,12 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) > mutex_unlock(&db_list.lock); > > return dmabuf; > + > +err_dmabuf: > + kfree(dmabuf); > +err_module: > + module_put(exp_info->owner); > + return ERR_PTR(ret); > } > EXPORT_SYMBOL_GPL(dma_buf_export); > > -- > 2.8.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch