Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2247187imm; Mon, 28 May 2018 04:43:10 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqM4ZjOvfmDxFyz71qQVIGB3uFIn0GwL2JWbgSUrxz8Zw9M2U1v3kBzr3IDqXEAFnxCIPZm X-Received: by 2002:a17:902:3081:: with SMTP id v1-v6mr13631773plb.266.1527507790261; Mon, 28 May 2018 04:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527507790; cv=none; d=google.com; s=arc-20160816; b=WDLUM6quazwEoJV+Q+PsEj1ZIQ+KV8z+mY47WFcBEUML1Ys4fLNnr0z3nDIu/XaRAS O698p05GFPt2IfLwUnb/XJ9JT8g0qXbuAnHV+TN0zOcCfznhP/rQ4HGtx6kONoVv2BCl DjpfEQhrVYC4PrMxQB3VfC5vBH2DW2ofKmMLYNVDc39QiU9cAv28QyM1gxhNhuuVCsRi 6G83O7nmsPXyZbzE7dJqz3hCPIKD+2PveYHggVnmA7Rc46R9JgPPv9mMZQoFjDqR99GY xFH7jQ99Ila0ksfS8/SNGijM7YjDbUsA8zDY6cyquwmwV1EREyhxB+qzHR9liBab+4Ck 5NvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=tHwCz2XgHGF1B1hEZEso/NSS7KcA49KtpHnVyqmSZas=; b=Z3WAvfW3sLBPaFfBaitmtvs0PYw8qIpFdA3K+4cO94dBlNQh4Zu5N7UHxFJ6iDQ0xQ ltzgsw2DOcQqoOBCt7baUNPhMzaaGRVd1frxDY4ra7EG+7BX610UII+8XKepIKNkPZZN F+zy2KLoCAmqM+wwxRHr+zktlrBqi2tqEHW4XLg6kvMWlg/hnqAkhJNF0wkkPZBgfp3o g5muINy5p42vBx/Km0zh6fQmQF6GrflUbVHnwpC9bEsmWQo0CwdJkO6NyJzKsDCuejtS NLq3AaYp7JjrhsLWQr5atu9Lrjbp7eaJNx03IMrE6UXrgmZqpXOmb2ObhelPiVcvdX4l B8cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aQGS2OlY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 18-v6si6864054pft.235.2018.05.28.04.42.55; Mon, 28 May 2018 04:43:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aQGS2OlY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424175AbeE1LlP (ORCPT + 99 others); Mon, 28 May 2018 07:41:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:59850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423822AbeE1LL6 (ORCPT ); Mon, 28 May 2018 07:11:58 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BD9C62089E; Mon, 28 May 2018 11:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527505918; bh=qxjd02KABAksI0UgxE05i0Nk01ej6/ZDGeQh81C5fRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aQGS2OlYb9WzhsBr6BF2LdNx1wG0PicQY1VpQeday7GijFXDf1B3YihgXizU8fyNb ExkdcG63N7yLRe3zHV4z7TORq4zSx2rKNoMVXL4zpKDfRrSk7Akfra7d2DX5FKLB2Y 82Fj8BTEgryneH/yAcJz1YmgLxrRJGWBdtdPq93s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Neil Armstrong , Sasha Levin Subject: [PATCH 4.16 175/272] drm/meson: Fix an un-handled error path in meson_drv_bind_master() Date: Mon, 28 May 2018 12:03:28 +0200 Message-Id: <20180528100255.442731300@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100240.256525891@linuxfoundation.org> References: <20180528100240.256525891@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit e770f6bf18182bc3af6ceec30189b6c323cbc157 ] 'drm_vblank_init()' can fail. So handle this (unlikely) error. Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Christophe JAILLET Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/6cbf3d70ac3904489c7194c895225c4103aebb96.1520885192.git.christophe.jaillet@wanadoo.fr Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/meson/meson_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -230,7 +230,10 @@ static int meson_drv_bind_master(struct priv->vsync_irq = platform_get_irq(pdev, 0); - drm_vblank_init(drm, 1); + ret = drm_vblank_init(drm, 1); + if (ret) + goto free_drm; + drm_mode_config_init(drm); drm->mode_config.max_width = 3840; drm->mode_config.max_height = 2160;