From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1436FC43219 for ; Thu, 2 May 2019 15:22:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBA9D20B7C for ; Thu, 2 May 2019 15:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810524; bh=NGXnUeEoQn0xz+HwCm3UodpSHg9illXVVlssyEU3wj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l03IPGFeXaadtAXpI2iKlsfjtaPPaznSP4cdLDr74pHSz+KvSdxrc9aqyupHBzHmA TibebPalARR7fOhbNU2XzldEjt0fmxDwk2FUptNi/iCmX+ugfqgo67PW3+lF6VrpWe FEm6dUd1Qp0271GfmGKL8kuksaFCHiAwWErty4lA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726447AbfEBPWD (ORCPT ); Thu, 2 May 2019 11:22:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726406AbfEBPWA (ORCPT ); Thu, 2 May 2019 11:22:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 3577D20656; Thu, 2 May 2019 15:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810519; bh=NGXnUeEoQn0xz+HwCm3UodpSHg9illXVVlssyEU3wj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sr8+eU98MyKFVENjQJhr/jYqk4/tymGTetuMkbf6DSQ6zLlmfh2HRu3xoz3jqccp2 tL9H9Eu/hU2tFxjtgGl0/cKmSow+tptSMtIGRiXTK+k/7AtoQe9LvtsBJCHV5EDcJn V4qCyG0BiGotoArI8XaqHqBMT2L9X0D+f4ezR4Tk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab , Naresh Kamboju Subject: [PATCH 4.9 03/32] media: vivid: check if the cec_adapter is valid Date: Thu, 2 May 2019 17:20:49 +0200 Message-Id: <20190502143316.137488919@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143314.649935114@linuxfoundation.org> References: <20190502143314.649935114@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil commit ed356f110403f6acc64dcbbbfdc38662ab9b06c2 upstream. If CEC is not enabled for the vivid driver, then the adap pointer is NULL and 'adap->phys_addr' will fail. Cc: # for v4.12 and up Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab [ Naresh: Fixed rebase conflict ] Signed-off-by: Naresh Kamboju Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/vivid/vivid-vid-common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/media/platform/vivid/vivid-vid-common.c +++ b/drivers/media/platform/vivid/vivid-vid-common.c @@ -841,6 +841,7 @@ int vidioc_g_edid(struct file *file, voi if (edid->start_block + edid->blocks > dev->edid_blocks) edid->blocks = dev->edid_blocks - edid->start_block; memcpy(edid->edid, dev->edid, edid->blocks * 128); - cec_set_edid_phys_addr(edid->edid, edid->blocks * 128, adap->phys_addr); + if (adap) + cec_set_edid_phys_addr(edid->edid, edid->blocks * 128, adap->phys_addr); return 0; }