Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2537409pxj; Mon, 10 May 2021 05:26:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfwBSDOIbayKxvhMk7Ty6h+5PAREjofsz8LlbQFTvs+tvwaO/5X12w64m5RnaD6am17ba7 X-Received: by 2002:a5d:9b86:: with SMTP id r6mr3493925iom.43.1620649609574; Mon, 10 May 2021 05:26:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649609; cv=none; d=google.com; s=arc-20160816; b=AyV6j01uT/ps/iKOwHBuJrNZz77vdFe32g9z+E9FcP/j0ddrgHTQ1bR/jp0OauCkEf z5qTxpXt+VjjfNhwdWj7MNddWndbtfb5nyE0F+IagRAWH781yZPFtaUHLJ31FwgP6dU8 S9rUwMTsI9BclHCmZAJIj/KnKEpT75Yc7iLGy69kaV/ZBa9orDnNqK7Mb0IAYIrS+s2P GpTDcp/kU5mB8w6K+Lwxk2cxmc47MGAbnT68DrE9inCCFe6GBM5/t5KjDcIRFSwCwOLb nNoKTyqrj+7K1qxAF5UW3CA5cSRK3dVlt5/AQJag3ojQn5mH8yDDjQmnGBsHa5CpY7DN w22A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ixxbwXR7vPESkTnaV50Aqt8xcOKI/Wg5yfJjirzKECQ=; b=frsV/fTP3kNUD8Tzud+tcm2+YZKtTv6XPhlnNEuBAuzUJLoQmaA3FhqNWt3bx/q8Sw 4E1ZzLJk7WbpyTgQiQKCX23x+JfSUBc97fbHtlabPj7kV1JU37msDjDPOrvbR3dAuh7J NWjNRPvdvxzWMTOho7tf1/r4hRSFH0z5QgD/4JrCTZIMI+QjED397nICBBWj9nCKH6In aIxUF6HC+/IYFkSpx9x5D7R3zeZZc6FA03gmtyDfZuqdMt2Rwqz94Mxtli8ZHne+bJ7K r4lGYjU79nVHvg/hL48qmEVtg6F8y3T6Pe4HjhVCCafv5rMYvIv7uCDxBLvLj+0eJk66 PZyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tRYrcrsW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n1si15658531ili.3.2021.05.10.05.26.33; Mon, 10 May 2021 05:26:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tRYrcrsW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238976AbhEJMSD (ORCPT + 99 others); Mon, 10 May 2021 08:18:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:44342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232821AbhEJLIy (ORCPT ); Mon, 10 May 2021 07:08:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F66E6191B; Mon, 10 May 2021 11:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644660; bh=XCtJfkGFbC2VRs0fahHq2Xv98B7QeAWABesY4G/UWe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tRYrcrsWmj+QaobWVHP3+Pnb0CT01TOfy2udXBo0LrXC43egXJk0QcabveLB2FWhj SBOGiG0uk62C7QpV5O3CtUFJdro31mksO/U+QDUfaLniYcs5x/yk+yuUQOXzFpg6Sm P/cvr+sbK1+uOTtTeISrAjPeks7jqSePu4PzT4dE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.12 172/384] atomisp: dont let it go past pipes array Date: Mon, 10 May 2021 12:19:21 +0200 Message-Id: <20210510102020.548281396@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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: linux-kernel@vger.kernel.org From: Mauro Carvalho Chehab [ Upstream commit 1f6c45ac5fd70ab59136ab5babc7def269f3f509 ] In practice, IA_CSS_PIPE_ID_NUM should never be used when calling atomisp_q_video_buffers_to_css(), as the driver should discover the right pipe before calling it. Yet, if some pipe parsing issue happens, it could end using it. So, add a WARN_ON() to prevent such case. Reported-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/atomisp/pci/atomisp_fops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c index 453bb6913550..f1e6b2597853 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c @@ -221,6 +221,9 @@ int atomisp_q_video_buffers_to_css(struct atomisp_sub_device *asd, unsigned long irqflags; int err = 0; + if (WARN_ON(css_pipe_id >= IA_CSS_PIPE_ID_NUM)) + return -EINVAL; + while (pipe->buffers_in_css < ATOMISP_CSS_Q_DEPTH) { struct videobuf_buffer *vb; -- 2.30.2