From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [PATCH] drm/cma-helper: fixup compilation Date: Tue, 19 Feb 2013 08:43:39 +0100 Message-ID: <20130219074339.GA5456@avionic-0098.mockup.avionic-design.de> References: <1360923875-26691-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1107507557==" Return-path: Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.10]) by gabe.freedesktop.org (Postfix) with ESMTP id 50B36E5EDE for ; Mon, 18 Feb 2013 23:43:44 -0800 (PST) In-Reply-To: <1360923875-26691-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: DRI Development List-Id: dri-devel@lists.freedesktop.org --===============1107507557== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vtzGhvizbBRQ85DL" Content-Disposition: inline --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 15, 2013 at 11:24:35AM +0100, Daniel Vetter wrote: > /me grabs a few brown paper bags >=20 > So it looks like I've broken compilation in >=20 > commit 6aed8ec3f76a22217c9ae183d32b1aa990bed069 > Author: Daniel Vetter > Date: Sun Jan 20 17:32:21 2013 +0100 >=20 > drm: review locking for drm_fb_helper_restore_fbdev_mode >=20 > Fix it up again. >=20 > Reported-by: Wu Fengguang > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/drm_fb_cma_helper.c | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb= _cma_helper.c > index e851658..ef68e34 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -377,6 +377,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); > */ > void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma) > { > + struct drm_device *dev =3D fbdev_cma->fb_helper.dev; > + > drm_modeset_lock_all(dev); > if (fbdev_cma) > drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper); The above check indicates that fbdev_cma might be NULL, so you're potentially dereferencing NULL when assigning the dev variable. Perhaps a better way would be to move the locking into the if block, as in the patch below. Thierry diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_c= ma_helper.c index e851658..54a250f 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -377,10 +377,11 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); */ void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma) { - drm_modeset_lock_all(dev); - if (fbdev_cma) + if (fbdev_cma) { + drm_modeset_lock_all(fbdev_cma->fb_helper.dev); drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper); - drm_modeset_unlock_all(dev); + drm_modeset_unlock_all(fbdev_cma->fb_helper.dev); + } } EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode); --vtzGhvizbBRQ85DL Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAEBAgAGBQJRIy0rAAoJEN0jrNd/PrOhhmcQAKnEou0mBFiIA14GPzSVmkuY mUHVZ0rAJHUJjtERzKKUN6m/2ocYLja1P7OYMWT4t9tft8RxGetU00LPtlXaqbM4 3Kva717dNeZNHqykYd8Np8e2Uj1tMFHCwlSs+9XqIs6C0zx//uLFqeAAwDOWqyDp j/tci5GV+ssjMhTnH8uWVpREENgC7hxOpQUjyHK64bwV4dPFanqoCkHHKB9HTk+D CIGr6XGxfr8mr/hbb+uvQcTG15Cwyii2kZQcp24fIRWevUHRUxVzHP5Ojk0bbCwd UtTEWEuG28HED8SSF/xuZWm1/fD6eQtiylGhermfYeQSKN7EfZFczrGviAstK0xy 01tydwg+7SVLnwjpzoA+WR0ingbE6V3fMjsy+6E3OSxLwSRQ2nncYEUO4e44JgjQ hH2wn7UPfeocnOfdbHIm1vNhNee+Ib4Yzu2CCnxlHKM7/6C6GlIOxVjbcP3Zo0W/ 3POngMU4bR3EvkOyUBZVs/quL5+COczRhxSLLK//KgqaNYrT8LrjS0KoRM87962Q 53Y3JGx5orhgutsRiEiK7dODVT5V6mML1uLIovXYpRG/1mPa/FU/zUbOQ4fQcAU1 I6cLF/zQP4SuptnazElvNV/b369CWH9xis6YMQhpTTGT1M2Lyc3G6j9qQ+Juv1A1 4jvA/KszUkq8ZW7BRnw5 =o1k3 -----END PGP SIGNATURE----- --vtzGhvizbBRQ85DL-- --===============1107507557== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --===============1107507557==--