Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp264862ybi; Wed, 29 May 2019 20:58:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwY7OyqMJRo6kk9CfNJ5X8xdn/o3R5U4jco2r+O1Vd5dEf+WjWzFxyfNkVbj71/3OjYW+sf X-Received: by 2002:a65:5304:: with SMTP id m4mr1820373pgq.126.1559188716844; Wed, 29 May 2019 20:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559188716; cv=none; d=google.com; s=arc-20160816; b=RtdJdQodMQx7vhgH5yc7QBfMIEJp/Y9N13gDNvki/ICvROH7RjoP26QD/m5ZiB9hhF WV5CgY4UcFN6Ru7n5v/zikTTAJNfTVl4xPsP5TadvAQD9koWqEMMFjB+K/EkswYCwVi4 ClpVaudLGXeW+oHnfP7TTrn27CeWgM4Y0tF7LekAip97dVWFvBtaplfkaOsrN1YwWZ6m l4GWFrfsCe0A2b2wkaVsHkq3yG5mO32IxoLUa9vb7hQ2Z+wbcpfgZj7Oa/e0th5k2ITr 9sfdjXAjG5a2+p9gAIP1PBGA7bpKUmQ8mowfAaxtoXlWY4jK7TkhTRdEQSeirLVYVYsS 4qWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sVpO6BhwnsnEAe5uwG9kZ+AQ/sLZL/CNMk5hsVu9jg8=; b=AjRIxDgxSjn2rYydiHqQ2AKqnEYGgpoIoaHKJQmjZyLbYEe6Pf8LxpDJibUaPz7ERj XqeZ9J2Ta7NSSmSPJQxpirfqxBAnbewzHUXm/13w0hNTRcFJ/NDCXg0bhqr8ULhUe8ls zhFcRx113tBWkme7sL8JIRjNIZQR67ooHJF5ADj40n+9kZZZYqu4JjPLGipzhpza7+og TbIMx+gmaAoNBSws7Jn8cRJp1PmtfjygEzpkNT0GG8QDSrzLMARgIa8dvMHMVHDjkcxB TYqGhfNrwPcgmVbErtR6MWetuEdbMdEWyWVZkA3tQMSEaMFimsDz+MKTN373Vv/YiCB2 147w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JCPHzKHa; 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 e36si2071629plb.180.2019.05.29.20.58.21; Wed, 29 May 2019 20:58:36 -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=JCPHzKHa; 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 S1728770AbfE3DzJ (ORCPT + 99 others); Wed, 29 May 2019 23:55:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:54276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731837AbfE3DTN (ORCPT ); Wed, 29 May 2019 23:19:13 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 F0A9024851; Thu, 30 May 2019 03:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186353; bh=Aejag5TLKIl5447kOyGIu/8gjDxU6nlebDlgGC34zcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JCPHzKHa6y9KLzV9mJaD6aB+Yeqge+8BzXVtvCgH+Yd0YrjThFUuEbKzHUbv7dqFD VwnoSPpJGA64TDaTsOs/vhjDrNxqu4OqM2/RjB/k89nL/LiEbca3/s6V6DptvcbR6P qxmwGrZ6PUzpbNyotuY8uWL391aLukntkVM4UT/0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hugues Fruchet , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 093/193] media: stm32-dcmi: fix crash when subdev do not expose any formats Date: Wed, 29 May 2019 20:05:47 -0700 Message-Id: <20190530030501.998357216@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@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 [ Upstream commit 33dfeb62e23c31619d2197850f7e8b50e8cc5466 ] Do not access sd_formats[] if num_of_sd_formats is zero, ie subdev sensor didn't expose any formats. Signed-off-by: Hugues Fruchet Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/stm32/stm32-dcmi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index 35ba6f211b790..4281f3f76ab15 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -775,6 +775,9 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f, sd_fmt = find_format_by_fourcc(dcmi, pix->pixelformat); if (!sd_fmt) { + if (!dcmi->num_of_sd_formats) + return -ENODATA; + sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats - 1]; pix->pixelformat = sd_fmt->fourcc; } @@ -946,6 +949,9 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi, sd_fmt = find_format_by_fourcc(dcmi, pix->pixelformat); if (!sd_fmt) { + if (!dcmi->num_of_sd_formats) + return -ENODATA; + sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats - 1]; pix->pixelformat = sd_fmt->fourcc; } -- 2.20.1