From: Rob Clark Subject: [PATCH] drm: fix double drm_put_minor() in fail paths Date: Thu, 12 Dec 2013 12:07:39 -0500 Message-ID: <1386868059-30511-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-qe0-f44.google.com (mail-qe0-f44.google.com [209.85.128.44]) by gabe.freedesktop.org (Postfix) with ESMTP id E0EBFFB721 for ; Thu, 12 Dec 2013 09:07:43 -0800 (PST) Received: by mail-qe0-f44.google.com with SMTP id nd7so576499qeb.17 for ; Thu, 12 Dec 2013 09:07:42 -0800 (PST) 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: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org If driver failed to load (for example, -EPROBE_DEFER), we'd end up doing drm_put_minor() both from drm_dev_register() and drm_dev_free(), the second time with a bogus pointer. Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_stub.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index f53d524..f245d99 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -567,10 +567,13 @@ err_unload: dev->driver->unload(dev); err_primary_node: drm_put_minor(dev->primary); + dev->primary = NULL; err_render_node: drm_put_minor(dev->render); + dev->render = NULL; err_control_node: drm_put_minor(dev->control); + dev->control = NULL; err_agp: if (dev->driver->bus->agp_destroy) dev->driver->bus->agp_destroy(dev); -- 1.8.4.2