* [PATCH 5.15.y] drm/virtio: Fix error code in virtio_gpu_object_shmem_init()
@ 2023-03-02 17:25 Harshit Mogalapalli
2023-03-03 21:32 ` Dmitry Osipenko
0 siblings, 1 reply; 3+ messages in thread
From: Harshit Mogalapalli @ 2023-03-02 17:25 UTC (permalink / raw)
To: dmitry.osipenko, stable
Cc: kraxel, linux-kernel, emil.l.velikov, airlied, error27,
darren.kenny, vegard.nossum, Harshit Mogalapalli
In virtio_gpu_object_shmem_init() we are passing NULL to PTR_ERR, which
is returning 0/success.
Fix this by storing error value in 'ret' variable before assigning
shmem->pages to NULL.
Found using static analysis with Smatch.
Fixes: 64b88afbd92f ("drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling")
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
---
Only compile tested.
Upstream commit b5c9ed70d1a9 ("drm/virtio: Improve DMA API usage for shmem BOs")
deleted this code, so this patch is not necessary in linux-6.1.y and
linux-6.2.y.
---
drivers/gpu/drm/virtio/virtgpu_object.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index 7e75fb0fc7bd..25d399b00404 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -169,8 +169,9 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
shmem->pages = drm_gem_shmem_get_sg_table(&bo->base);
if (IS_ERR(shmem->pages)) {
drm_gem_shmem_unpin(&bo->base);
+ ret = PTR_ERR(shmem->pages);
shmem->pages = NULL;
- return PTR_ERR(shmem->pages);
+ return ret;
}
if (use_dma_api) {
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 5.15.y] drm/virtio: Fix error code in virtio_gpu_object_shmem_init()
2023-03-02 17:25 [PATCH 5.15.y] drm/virtio: Fix error code in virtio_gpu_object_shmem_init() Harshit Mogalapalli
@ 2023-03-03 21:32 ` Dmitry Osipenko
2023-03-10 12:07 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Osipenko @ 2023-03-03 21:32 UTC (permalink / raw)
To: Harshit Mogalapalli, stable
Cc: kraxel, linux-kernel, emil.l.velikov, airlied, error27,
darren.kenny, vegard.nossum
On 3/2/23 20:25, Harshit Mogalapalli wrote:
> In virtio_gpu_object_shmem_init() we are passing NULL to PTR_ERR, which
> is returning 0/success.
>
> Fix this by storing error value in 'ret' variable before assigning
> shmem->pages to NULL.
>
> Found using static analysis with Smatch.
>
> Fixes: 64b88afbd92f ("drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling")
> Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
> ---
> Only compile tested.
>
> Upstream commit b5c9ed70d1a9 ("drm/virtio: Improve DMA API usage for shmem BOs")
> deleted this code, so this patch is not necessary in linux-6.1.y and
> linux-6.2.y.
> ---
> drivers/gpu/drm/virtio/virtgpu_object.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
> index 7e75fb0fc7bd..25d399b00404 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_object.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
> @@ -169,8 +169,9 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
> shmem->pages = drm_gem_shmem_get_sg_table(&bo->base);
> if (IS_ERR(shmem->pages)) {
> drm_gem_shmem_unpin(&bo->base);
> + ret = PTR_ERR(shmem->pages);
> shmem->pages = NULL;
> - return PTR_ERR(shmem->pages);
> + return ret;
> }
>
> if (use_dma_api) {
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 5.15.y] drm/virtio: Fix error code in virtio_gpu_object_shmem_init()
2023-03-03 21:32 ` Dmitry Osipenko
@ 2023-03-10 12:07 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2023-03-10 12:07 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Harshit Mogalapalli, stable, kraxel, linux-kernel, emil.l.velikov,
airlied, error27, darren.kenny, vegard.nossum
On Sat, Mar 04, 2023 at 12:32:22AM +0300, Dmitry Osipenko wrote:
> On 3/2/23 20:25, Harshit Mogalapalli wrote:
> > In virtio_gpu_object_shmem_init() we are passing NULL to PTR_ERR, which
> > is returning 0/success.
> >
> > Fix this by storing error value in 'ret' variable before assigning
> > shmem->pages to NULL.
> >
> > Found using static analysis with Smatch.
> >
> > Fixes: 64b88afbd92f ("drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling")
> > Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
> > ---
> > Only compile tested.
> >
> > Upstream commit b5c9ed70d1a9 ("drm/virtio: Improve DMA API usage for shmem BOs")
> > deleted this code, so this patch is not necessary in linux-6.1.y and
> > linux-6.2.y.
> > ---
> > drivers/gpu/drm/virtio/virtgpu_object.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
> > index 7e75fb0fc7bd..25d399b00404 100644
> > --- a/drivers/gpu/drm/virtio/virtgpu_object.c
> > +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
> > @@ -169,8 +169,9 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
> > shmem->pages = drm_gem_shmem_get_sg_table(&bo->base);
> > if (IS_ERR(shmem->pages)) {
> > drm_gem_shmem_unpin(&bo->base);
> > + ret = PTR_ERR(shmem->pages);
> > shmem->pages = NULL;
> > - return PTR_ERR(shmem->pages);
> > + return ret;
> > }
> >
> > if (use_dma_api) {
>
> Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Both fixes now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-10 12:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-02 17:25 [PATCH 5.15.y] drm/virtio: Fix error code in virtio_gpu_object_shmem_init() Harshit Mogalapalli
2023-03-03 21:32 ` Dmitry Osipenko
2023-03-10 12:07 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox