From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Christian_K=F6nig?= Subject: Re: [PATCH] drm/radeon/vm: don't attempt to update ptes if ib allocation fails Date: Thu, 14 Nov 2013 09:33:03 +0100 Message-ID: <52848ABF.7030404@vodafone.de> References: <1384374541-28696-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id E2B8DFB461 for ; Thu, 14 Nov 2013 00:33:09 -0800 (PST) In-Reply-To: <1384374541-28696-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Alex Deucher , dri-devel@lists.freedesktop.org Cc: Alex Deucher , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Am 13.11.2013 21:29, schrieb Alex Deucher: > If we fail to allocate an indirect buffer (ib) when updating > the ptes, return an error instead of trying to use the ib. > Avoids a null pointer dereference. > > Bug: > https://bugzilla.kernel.org/show_bug.cgi?id=3D58621 > > Signed-off-by: Alex Deucher > Cc: stable@vger.kernel.org I'm getting old. I've seen that as well while working on the VM page = table init, but forgotten to fix it... Reviewed-by: Christian K=F6nig > --- > drivers/gpu/drm/radeon/radeon_gart.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeo= n/radeon_gart.c > index cd7489b..3044e50 100644 > --- a/drivers/gpu/drm/radeon/radeon_gart.c > +++ b/drivers/gpu/drm/radeon/radeon_gart.c > @@ -1209,6 +1209,8 @@ int radeon_vm_bo_update_pte(struct radeon_device *r= dev, > return -ENOMEM; > = > r =3D radeon_ib_get(rdev, R600_RING_TYPE_DMA_INDEX, &ib, NULL, ndw * 4= ); > + if (r) > + return r; > ib.length_dw =3D 0; > = > r =3D radeon_vm_update_pdes(rdev, vm, &ib, bo_va->soffset, bo_va->eoff= set);