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=-8.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 19EE7C43387 for ; Wed, 16 Jan 2019 16:14:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C845020675 for ; Wed, 16 Jan 2019 16:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547655240; bh=lcEvLvl4lAn50B8YkgGsSinBqGYdeJ50Y3y6OU/1MjY=; h=From:Date:Subject:To:Cc:Reply-to:List-ID:From; b=Is6P93zHj1tmjOu5lLrMkhJObRAIVIzhiZXYszEc3D1eAUC+gd3TtmeUwsI6RzEXI GwHR40jqXSif12E/j7ojIsC6k1vJmzxcZD3bmoypuW7vD4oCYdugzSfExSkGu3k5+d TS6j09Y+edOfO3uJjoWy7lF4V0QcL1ys6iRHuaE4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727873AbfAPQOA (ORCPT ); Wed, 16 Jan 2019 11:14:00 -0500 Received: from www.linuxtv.org ([130.149.80.248]:56732 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727878AbfAPQOA (ORCPT ); Wed, 16 Jan 2019 11:14:00 -0500 Received: from mchehab by www.linuxtv.org with local (Exim 4.84_2) (envelope-from ) id 1gjnpG-0006FZ-Gm; Wed, 16 Jan 2019 16:13:58 +0000 From: Mauro Carvalho Chehab Date: Wed, 16 Jan 2019 16:12:38 +0000 Subject: [git:media_tree/fixes] media: v4l: ioctl: Validate num_planes for debug messages To: linuxtv-commits@linuxtv.org Cc: stable@vger.kernel.org, Hans Verkuil , Thierry Reding , Sakari Ailus Mail-followup-to: linux-media@vger.kernel.org Forward-to: linux-media@vger.kernel.org Reply-to: linux-media@vger.kernel.org Message-Id: Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is an automatic generated email to let you know that the following patch were queued: Subject: media: v4l: ioctl: Validate num_planes for debug messages Author: Sakari Ailus Date: Thu Jan 10 09:24:26 2019 -0500 The num_planes field in struct v4l2_pix_format_mplane is used in a loop before validating it. As the use is printing a debug message in this case, just cap the value to the maximum allowed. Signed-off-by: Sakari Ailus Cc: stable@vger.kernel.org Reviewed-by: Thierry Reding Signed-off-by: Hans Verkuil Cc: # for v4.12 and up Signed-off-by: Mauro Carvalho Chehab drivers/media/v4l2-core/v4l2-ioctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 44bc7c4f1c11..90aad465f9ed 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -287,6 +287,7 @@ static void v4l_print_format(const void *arg, bool write_only) const struct v4l2_window *win; const struct v4l2_sdr_format *sdr; const struct v4l2_meta_format *meta; + u32 planes; unsigned i; pr_cont("type=%s", prt_names(p->type, v4l2_type_names)); @@ -317,7 +318,8 @@ static void v4l_print_format(const void *arg, bool write_only) prt_names(mp->field, v4l2_field_names), mp->colorspace, mp->num_planes, mp->flags, mp->ycbcr_enc, mp->quantization, mp->xfer_func); - for (i = 0; i < mp->num_planes; i++) + planes = min_t(u32, mp->num_planes, VIDEO_MAX_PLANES); + for (i = 0; i < planes; i++) printk(KERN_DEBUG "plane %u: bytesperline=%u sizeimage=%u\n", i, mp->plane_fmt[i].bytesperline, mp->plane_fmt[i].sizeimage);