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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 39825C388F7 for ; Tue, 3 Nov 2020 21:09:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 056C3223BF for ; Tue, 3 Nov 2020 21:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437784; bh=MdjBSPkgsz9paR4rhfpj8KntD4vYei0etpsLlNxD7tw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eXOe6k1dE551UuixLCc3i8guZH9dZh9UmHV3Peqn8LTzniGE3HTrIWatzoDmEmlYk zCSKa222yzPHCoRfN6WiKOCI3T7TiMESWn1UvUOMjqpbvzRMozYPNvOcMAIgTefD12 krM126sfZoAe33L5kbPo7PQq6qK7tmlUTXLO3S/8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730839AbgKCVJl (ORCPT ); Tue, 3 Nov 2020 16:09:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:49850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388553AbgKCVJl (ORCPT ); Tue, 3 Nov 2020 16:09:41 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 0FEA0206B5; Tue, 3 Nov 2020 21:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437780; bh=MdjBSPkgsz9paR4rhfpj8KntD4vYei0etpsLlNxD7tw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YVzcayY72Lb2OuCMSHS7mP5h324t0Nwe35lqu2hlulFr9g5ZE+c4rhlcrMHgcJZ5E 9ixGoxAZ+/+ULsXu9eNvaMOX6f3KE45HdlEa02w72ItDGdaYbIYCgysftKGzDc9E9t k0oXSmsApSJu3WWB+8tCpS1Z4ITlr7SJ/a/VUv7M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomasz Figa , Xia Jiang , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 030/125] media: platform: Improve queue set up flow for bug fixing Date: Tue, 3 Nov 2020 21:36:47 +0100 Message-Id: <20201103203201.080789134@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203156.372184213@linuxfoundation.org> References: <20201103203156.372184213@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: 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 46c996936798a..fd9e13500fe7f 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -579,6 +579,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.27.0