* [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg
@ 2018-06-18 6:07 Oleksandr Andrushchenko
2018-06-18 6:08 ` Oleksandr Andrushchenko
2018-06-18 12:29 ` Dan Carpenter
0 siblings, 2 replies; 6+ messages in thread
From: Oleksandr Andrushchenko @ 2018-06-18 6:07 UTC (permalink / raw)
To: xen-devel, linux-kernel, dri-devel, airlied, daniel.vetter,
seanpaul, gustavo, jgross, boris.ostrovsky, dan.carpenter
Cc: andr2000, Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Dan Carpenter has reported that there is the following static checker
warning:
drivers/gpu/drm/drm_prime.c:317 drm_gem_map_dma_buf()
warn: 'sgt' can also be NULL
314 sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
315
316 if (!IS_ERR(sgt)) {
317 if (!dma_map_sg_attrs(attach->dev, sgt->sgl, sgt->nents, dir,
Problematic functions are xen_drm_front_gem_get_sg_table and
drm_gem_cma_prime_get_sg_table. Fix those by replacing NULL with error value.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 80a5115c3846..ce868ce288fb 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
if (!sgt)
- return NULL;
+ return ERR_PTR(-ENOMEM);
ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
cma_obj->paddr, obj->size);
diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
index c85bfe7571cb..47ff019d3aef 100644
--- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
+++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
@@ -179,7 +179,7 @@ struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj)
struct xen_gem_object *xen_obj = to_xen_gem_obj(gem_obj);
if (!xen_obj->pages)
- return NULL;
+ return ERR_PTR(-ENOMEM);
return drm_prime_pages_to_sg(xen_obj->pages, xen_obj->num_pages);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg
2018-06-18 6:07 [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg Oleksandr Andrushchenko
@ 2018-06-18 6:08 ` Oleksandr Andrushchenko
2018-06-18 12:29 ` Dan Carpenter
1 sibling, 0 replies; 6+ messages in thread
From: Oleksandr Andrushchenko @ 2018-06-18 6:08 UTC (permalink / raw)
To: xen-devel, linux-kernel, dri-devel, airlied, daniel.vetter,
seanpaul, gustavo, jgross, boris.ostrovsky, dan.carpenter
Cc: Oleksandr Andrushchenko
On 06/18/2018 09:07 AM, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> Dan Carpenter has reported that there is the following static checker
> warning:
> drivers/gpu/drm/drm_prime.c:317 drm_gem_map_dma_buf()
> warn: 'sgt' can also be NULL
>
> 314 sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
> 315
> 316 if (!IS_ERR(sgt)) {
> 317 if (!dma_map_sg_attrs(attach->dev, sgt->sgl, sgt->nents, dir,
>
> Problematic functions are xen_drm_front_gem_get_sg_table and
> drm_gem_cma_prime_get_sg_table. Fix those by replacing NULL with error value.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Dan, could you please review?
> ---
> drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
> drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
> index 80a5115c3846..ce868ce288fb 100644
> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> @@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
>
> sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
> if (!sgt)
> - return NULL;
> + return ERR_PTR(-ENOMEM);
>
Forgot to patch CMA helpers, thus v2
> ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
> cma_obj->paddr, obj->size);
> diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
> index c85bfe7571cb..47ff019d3aef 100644
> --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
> +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
> @@ -179,7 +179,7 @@ struct sg_table *xen_drm_front_gem_get_sg_table(struct drm_gem_object *gem_obj)
> struct xen_gem_object *xen_obj = to_xen_gem_obj(gem_obj);
>
> if (!xen_obj->pages)
> - return NULL;
> + return ERR_PTR(-ENOMEM);
>
> return drm_prime_pages_to_sg(xen_obj->pages, xen_obj->num_pages);
> }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg
2018-06-18 6:07 [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg Oleksandr Andrushchenko
2018-06-18 6:08 ` Oleksandr Andrushchenko
@ 2018-06-18 12:29 ` Dan Carpenter
2018-06-18 12:32 ` Oleksandr Andrushchenko
1 sibling, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2018-06-18 12:29 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, linux-kernel, dri-devel, airlied, daniel.vetter,
seanpaul, gustavo, jgross, boris.ostrovsky,
Oleksandr Andrushchenko
On Mon, Jun 18, 2018 at 09:07:09AM +0300, Oleksandr Andrushchenko wrote:
> drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
> drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
> index 80a5115c3846..ce868ce288fb 100644
> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> @@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
>
> sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
> if (!sgt)
> - return NULL;
> + return ERR_PTR(-ENOMEM);
>
> ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
> cma_obj->paddr, obj->size);
If dma_get_sgtable() fails then we return NULL.
Fix that and it should be good.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg
2018-06-18 12:29 ` Dan Carpenter
@ 2018-06-18 12:32 ` Oleksandr Andrushchenko
2018-07-12 11:58 ` Oleksandr Andrushchenko
0 siblings, 1 reply; 6+ messages in thread
From: Oleksandr Andrushchenko @ 2018-06-18 12:32 UTC (permalink / raw)
To: Dan Carpenter, Oleksandr Andrushchenko
Cc: xen-devel, linux-kernel, dri-devel, airlied, daniel.vetter,
seanpaul, gustavo, jgross, boris.ostrovsky
On 06/18/2018 03:29 PM, Dan Carpenter wrote:
> On Mon, Jun 18, 2018 at 09:07:09AM +0300, Oleksandr Andrushchenko wrote:
>> drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
>> drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
>> index 80a5115c3846..ce868ce288fb 100644
>> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
>> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
>> @@ -436,7 +436,7 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
>>
>> sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
>> if (!sgt)
>> - return NULL;
>> + return ERR_PTR(-ENOMEM);
>>
>> ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
>> cma_obj->paddr, obj->size);
>
> If dma_get_sgtable() fails then we return NULL.
>
> Fix that and it should be good.
You mean I can put your r-b with that fixed?
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg
2018-06-18 12:32 ` Oleksandr Andrushchenko
@ 2018-07-12 11:58 ` Oleksandr Andrushchenko
2018-07-12 12:16 ` Dan Carpenter
0 siblings, 1 reply; 6+ messages in thread
From: Oleksandr Andrushchenko @ 2018-07-12 11:58 UTC (permalink / raw)
To: Oleksandr Andrushchenko, Dan Carpenter
Cc: jgross, airlied, linux-kernel, dri-devel, daniel.vetter,
xen-devel, boris.ostrovsky
On 06/18/2018 03:32 PM, Oleksandr Andrushchenko wrote:
> On 06/18/2018 03:29 PM, Dan Carpenter wrote:
>> On Mon, Jun 18, 2018 at 09:07:09AM +0300, Oleksandr Andrushchenko wrote:
>>> drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
>>> drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +-
>>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c
>>> b/drivers/gpu/drm/drm_gem_cma_helper.c
>>> index 80a5115c3846..ce868ce288fb 100644
>>> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
>>> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
>>> @@ -436,7 +436,7 @@ struct sg_table
>>> *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
>>> sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
>>> if (!sgt)
>>> - return NULL;
>>> + return ERR_PTR(-ENOMEM);
>>> ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
>>> cma_obj->paddr, obj->size);
>>
>> If dma_get_sgtable() fails then we return NULL.
>>
>> Fix that and it should be good.
> You mean I can put your r-b with that fixed?
ping
>> regards,
>> dan carpenter
>>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg
2018-07-12 11:58 ` Oleksandr Andrushchenko
@ 2018-07-12 12:16 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2018-07-12 12:16 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: jgross, Oleksandr Andrushchenko, airlied, linux-kernel,
dri-devel, daniel.vetter, xen-devel, boris.ostrovsky
On Thu, Jul 12, 2018 at 02:58:00PM +0300, Oleksandr Andrushchenko wrote:
> On 06/18/2018 03:32 PM, Oleksandr Andrushchenko wrote:
> > On 06/18/2018 03:29 PM, Dan Carpenter wrote:
> > > On Mon, Jun 18, 2018 at 09:07:09AM +0300, Oleksandr Andrushchenko wrote:
> > > > drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
> > > > drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +-
> > > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c
> > > > b/drivers/gpu/drm/drm_gem_cma_helper.c
> > > > index 80a5115c3846..ce868ce288fb 100644
> > > > --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> > > > +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> > > > @@ -436,7 +436,7 @@ struct sg_table
> > > > *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
> > > > sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
> > > > if (!sgt)
> > > > - return NULL;
> > > > + return ERR_PTR(-ENOMEM);
> > > > ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
> > > > cma_obj->paddr, obj->size);
> > >
> > > If dma_get_sgtable() fails then we return NULL.
> > >
> > > Fix that and it should be good.
> > You mean I can put your r-b with that fixed?
> ping
Yeah. Send the v2 patch and I'll review it.
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-07-12 12:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-18 6:07 [PATCH v2] drm: Replace NULL with error value in drm_prime_pages_to_sg Oleksandr Andrushchenko
2018-06-18 6:08 ` Oleksandr Andrushchenko
2018-06-18 12:29 ` Dan Carpenter
2018-06-18 12:32 ` Oleksandr Andrushchenko
2018-07-12 11:58 ` Oleksandr Andrushchenko
2018-07-12 12:16 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).