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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 B6160C56201 for ; Tue, 27 Oct 2020 00:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3BD4F20829 for ; Tue, 27 Oct 2020 00:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603759606; bh=svbD03dAhIRdMt8Vfl7ShV83B0UlijO7mn+rnGE81yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eXSEDdZ0mc1W/LxDvp/2nGlv9XOHjtxbqkZKwUutbBbt1j19+6f8S7+KVTrxpFX7i ET23ln1JLxO7m999BFdpAwRwxC/CXyxTz5uQVlbNLoRp07FIU8aUoHqMPehKhllE+C GrNRBZLT+n1Z8jwQO4dntTKzcR4CA+wz1unSR0w4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410226AbgJ0Amb (ORCPT ); Mon, 26 Oct 2020 20:42:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:48824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409004AbgJZXuD (ORCPT ); Mon, 26 Oct 2020 19:50:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E762218AC; Mon, 26 Oct 2020 23:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756203; bh=svbD03dAhIRdMt8Vfl7ShV83B0UlijO7mn+rnGE81yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0obzOIqZ9hteWu/RAoH/ir2KcmMg/o9lWhKt5f3c1sx+HPplCdYCejLIip4QkaV0O kOWf8Dwyfjt+VgrjiBNZIGjbyqFN6PNUYPJUeIWPbGCKXORmZyTCrKJmbnNVQM9bwv E4LvWLtTlS5ndvAK9YF76CgzJgpvUHLxbcCF/BS0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xia Jiang , Tomasz Figa , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.9 046/147] media: platform: Improve queue set up flow for bug fixing Date: Mon, 26 Oct 2020 19:47:24 -0400 Message-Id: <20201026234905.1022767-46-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026234905.1022767-1-sashal@kernel.org> References: <20201026234905.1022767-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xia Jiang [ Upstream commit 5095a6413a0cf896ab468009b6142cb0fe617e66 ] Add checking created buffer size follow in mtk_jpeg_queue_setup(). Reviewed-by: Tomasz Figa Signed-off-by: Xia Jiang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c index 61fed1e35a005..b1ca4e3adae32 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -571,6 +571,13 @@ static int mtk_jpeg_queue_setup(struct vb2_queue *q, if (!q_data) return -EINVAL; + if (*num_planes) { + for (i = 0; i < *num_planes; i++) + if (sizes[i] < q_data->sizeimage[i]) + return -EINVAL; + return 0; + } + *num_planes = q_data->fmt->colplanes; for (i = 0; i < q_data->fmt->colplanes; i++) { sizes[i] = q_data->sizeimage[i]; -- 2.25.1