From patchwork Thu Aug 12 17:01:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 496314 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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 B19A3C4320A for ; Thu, 12 Aug 2021 17:01:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 872D560F57 for ; Thu, 12 Aug 2021 17:01:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234166AbhHLRCX (ORCPT ); Thu, 12 Aug 2021 13:02:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54453 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234110AbhHLRCW (ORCPT ); Thu, 12 Aug 2021 13:02:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628787716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fA6rYJ8jGaz9Q7oV+LT1wgeqyltB1zkMp7DyaXUnHo4=; b=R/XL/vbahcAGoGV1yKnXowfFodjdFifHtPl3Xw/SotzF1om48yHdfSc4tTgQLsGBRbs1Ef f2kDXZYGt1txNUPbuFweDvDimG/SGEihF9sojLkDGIDkaWEWEF+vekdWPSqPbavC4DIiHf AbxspytdKLg+hYiLN1PnQDIGVY3ZLW8= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-PN3kqZuPOQKRmtz0Al7vjQ-1; Thu, 12 Aug 2021 13:01:55 -0400 X-MC-Unique: PN3kqZuPOQKRmtz0Al7vjQ-1 Received: by mail-oo1-f69.google.com with SMTP id v3-20020a4ae0430000b029028735f9d900so2372929oos.12 for ; Thu, 12 Aug 2021 10:01:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fA6rYJ8jGaz9Q7oV+LT1wgeqyltB1zkMp7DyaXUnHo4=; b=cOOUqU9+U25+sBxgXGL5HOdMPXeYySc74gWfxumkcQTJDsxYMdfW5vPQQXQ/Av+m/V 0Px2IjSU57dSGwit8Mt2UFAZiK87PCIwOMjPC6hPaF5cIq7c6O3IK05djEXHUCaJS4ia X9kdh6EDMsAXBJ2334xXM2V7V8KcynLAqB/eHwQ7crVaufzKW24FIt7Q4WrML3LJKRMu G/tcueOZ+bjpHKeI5sH1VJXAvZ+zwuQu9LcfmY/doUJ6lH8H08wK9Go+BVhhUtn8fTYX eC8C0ow7s7UpjzZ+th/DrN6RJ2hGMPTdfQ1nYySYxFZcxOSIcUmU4NrPOfSpzNTXDw5o eNyA== X-Gm-Message-State: AOAM531TpNnB/SzkQVFLmUTtD7Gmq/2CqVwSGVl0LxuFdeL6hcfWi/Ol Fsn6FnMWNmcxY6Q546Iml1CNYV5DYv8VdRpQTknrMa/NHOiY8nZ4rw7ke8ZVz2EK5HE5cgnHAYw rPoE3tWe3HpGQPRlzeIV7RzE= X-Received: by 2002:aca:34c4:: with SMTP id b187mr4171749oia.139.1628787714954; Thu, 12 Aug 2021 10:01:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfv3Cg/zLBaCtKA1k94ILYil5i/BhCl7FUKSc481O7mxH6K3v5j81NvUZQFAfzy+CDHmaQiw== X-Received: by 2002:aca:34c4:: with SMTP id b187mr4171739oia.139.1628787714820; Thu, 12 Aug 2021 10:01:54 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id f8sm321336oos.4.2021.08.12.10.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 10:01:54 -0700 (PDT) From: trix@redhat.com To: hverkuil-cisco@xs4all.nl, mchehab@kernel.org, ville.syrjala@linux.intel.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] video/hdmi: handle short reads of hdmi info frame. Date: Thu, 12 Aug 2021 10:01:46 -0700 Message-Id: <20210812170146.1046885-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Tom Rix Calling hdmi_infoframe_unpack() with static sizeof(buffer) skips all the size checking done later in hdmi_infoframe_unpack(). A better value is the amount of data read into buffer. Fixes: 480b8b3e42c3 ("video/hdmi: Pass buffer size to infoframe unpack functions") Signed-off-by: Tom Rix --- drivers/media/i2c/adv7511-v4l2.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c index 41f4e749a859c..2217004264e4b 100644 --- a/drivers/media/i2c/adv7511-v4l2.c +++ b/drivers/media/i2c/adv7511-v4l2.c @@ -544,7 +544,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7511_cfg_read_ buffer[3] = 0; buffer[3] = hdmi_infoframe_checksum(buffer, len + 4); - if (hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer)) < 0) { + if (hdmi_infoframe_unpack(&frame, buffer, len + 4) < 0) { v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__, cri->desc); return; } diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index 122e1fdccd962..d688ffff7a074 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -2484,7 +2484,7 @@ static int adv76xx_read_infoframe(struct v4l2_subdev *sd, int index, buffer[i + 3] = infoframe_read(sd, adv76xx_cri[index].payload_addr + i); - if (hdmi_infoframe_unpack(frame, buffer, sizeof(buffer)) < 0) { + if (hdmi_infoframe_unpack(frame, buffer, len + 3) < 0) { v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__, adv76xx_cri[index].desc); return -ENOENT; diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 7f8acbdf0db4a..8ab4c63839b49 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -2593,7 +2593,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7842_cfg_read_ for (i = 0; i < len; i++) buffer[i + 3] = infoframe_read(sd, cri->payload_addr + i); - if (hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer)) < 0) { + if (hdmi_infoframe_unpack(&frame, buffer, len + 3) < 0) { v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__, cri->desc); return; }