Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2554431pxj; Mon, 10 May 2021 05:49:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzO3WzUC/kOkrR/itdtcDtnE9thTdIKmBKGH3Vm1mzALvwWPeCrI4gQMD5ITjJPP1/dThJ X-Received: by 2002:a02:6d6c:: with SMTP id e44mr21105494jaf.81.1620650974844; Mon, 10 May 2021 05:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620650974; cv=none; d=google.com; s=arc-20160816; b=VByFNbd5bGb1L9D8KEIQStGX+hI2Da3BmBPT5d8PTmDqwOM4uGSqa0SMEBcERm81Ah yOI6ETqZuOML8+K1JXc3/qfzmA80ijy6n0hZhbDePVMoBDCBt7Nf/j2RqftMMa4HQ0Bo HfGj8VZ4/qM6OZv6ljawxMQRBHqwNJibLLwYLzdUUoySjSvg6vLAjj+Q63e/+9iIE57C Gw4Z6t2S1J/B2otn0J6jgv/eAlO+YbmPMzJxBNXUPAaVzoQzQvyyoKgmRbdROUeO2uzA uMVkwE+nO9Od7PDjEI6jAkRWUnlpBoTUFbYWR4+DRNF40EkK7b0hT5a0u37G+woWJQLz aVkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0JxTDcJt4ZQGTCNWCRdSDB8Z+nRWfx33Y2/7KYxP+D8=; b=Nasm+6IPgDNDYhaw8L7nXQ1CjHeQPnsK62d2ftEUHJxgSHChyUbB3yUpfd6IwSa/r6 clJQwkmmWH1ngLiQ/KLLkkvC5m3qxJvZSFPHo26OZPJWx7hkIDVG1tBfBHhd3xn4DdJn as0BUcSo8Ha8F0mKxd4pQ7/SCb63dAQZEW1biBV1ypKePCj8zu+h87rYOQm/7XXTmptv zKqac059Zuxv+cdAmiawrfkQOaDOajajfH+K+Y1Cm72rqiiuZw+d89SUhzhmEie4FrMc F0j21WtvObOx12EcGySWiE8O5FNjKw8LNzRy/pTMwygDzNmCg2D7YFrc5vi7hkwx9yBn /Eiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pwa5lqiJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a14si20498588ilm.103.2021.05.10.05.49.15; Mon, 10 May 2021 05:49:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pwa5lqiJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233798AbhEJMiE (ORCPT + 99 others); Mon, 10 May 2021 08:38:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:60432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237834AbhEJLQS (ORCPT ); Mon, 10 May 2021 07:16:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E7AF6128E; Mon, 10 May 2021 11:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620645101; bh=fv4anlzDpP6hMcyLFnxxphDWL1hisyfY/aZq70Zqxxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pwa5lqiJGj3YNZ55BHUbghGRBygEvd9q43kSeyrHpVry90EiRq6ezcYS4qnquPOOk RqoWnOWDIVDVDRfPnjnoUhhCVj1r0qGOfCWSyDVprrfVIFHNWN6g6ffzrEhn0BcyBE hHls1+gOXxIl57A7cY1nCExcqVUR/4PZ1tVGEYYU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marco Felsch , Philipp Zabel , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.12 353/384] media: coda: fix macroblocks count control usage Date: Mon, 10 May 2021 12:22:22 +0200 Message-Id: <20210510102026.394360716@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marco Felsch commit 0b276e470a4d43e1365d3eb53c608a3d208cabd4 upstream. Commit b2d3bef1aa78 ("media: coda: Add a V4L2 user for control error macroblocks count") add the control for the decoder devices. But during streamon() this ioctl gets called for all (encoder and decoder) devices and on encoder devices this causes a null pointer exception. Fix this by setting the control only if it is really accessible. Fixes: b2d3bef1aa78 ("media: coda: Add a V4L2 user for control error macroblocks count") Signed-off-by: Marco Felsch Cc: Reviewed-by: Philipp Zabel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/coda/coda-common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -2062,7 +2062,9 @@ static int coda_start_streaming(struct v if (q_data_dst->fourcc == V4L2_PIX_FMT_JPEG) ctx->params.gop_size = 1; ctx->gopcounter = ctx->params.gop_size - 1; - v4l2_ctrl_s_ctrl(ctx->mb_err_cnt_ctrl, 0); + /* Only decoders have this control */ + if (ctx->mb_err_cnt_ctrl) + v4l2_ctrl_s_ctrl(ctx->mb_err_cnt_ctrl, 0); ret = ctx->ops->start_streaming(ctx); if (ctx->inst_type == CODA_INST_DECODER) {