From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 234EF262FD6; Wed, 23 Apr 2025 15:08:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420886; cv=none; b=i9vYZ4Owl/0KHXVG6Ky1ROsLI1CbzfMZCQq/vJMnGO9C/uWrxLFQXQYSDciB7gixYSETAMzH3YlguV2NfbL6Y2UzuJSxAMi4TNsJGw1WM0oXadkBzPilr9DH7iXr5Eo6TrzqA59omUCxpnpNLURmDYBqvqTmpUzx0sBdh++t0HM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420886; c=relaxed/simple; bh=z4RuWPpYSzyxFo9T0AeDZHlxgN8lc1KJV7t6F8L4zzE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pSWQWUFKzQbXVHm0eiPL0Q7qzW8B1SuCSOni7NLZOFnGj7AgCQVyCF8enUm2TfSDT3X3XHg3Dc5dbGE65MUTaItc2d94CxxgcXFkIrZqA+sgHhHuCjITI6JaoLikcyFEsZLbm/G8bTOTrxeBOcqW5fnW6sze7G/JxWJuek1tGr0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dI1W2VUf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dI1W2VUf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 449D7C4CEE2; Wed, 23 Apr 2025 15:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420884; bh=z4RuWPpYSzyxFo9T0AeDZHlxgN8lc1KJV7t6F8L4zzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dI1W2VUf/8Llfne5lGj6nJPBqwiajt41VkPdERqAsRsNdFoL5OoaLDOABipu8Bct1 FkCKmk5+Ze00eD3Ovr+le5ie9aPhs8b1w3lcIc+Fwfzl+FlTXINFrlc6A0Uvmi4gpL AWty75QmyCf7kMZF4Fe/zDR7vv+0RFyB0YQZr1qM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bryan ODonoghue , Vikash Garodia , Hans Verkuil Subject: [PATCH 6.6 124/393] media: venus: hfi: add check to handle incorrect queue size Date: Wed, 23 Apr 2025 16:40:20 +0200 Message-ID: <20250423142648.483859319@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vikash Garodia commit 69baf245b23e20efda0079238b27fc63ecf13de1 upstream. qsize represents size of shared queued between driver and video firmware. Firmware can modify this value to an invalid large value. In such situation, empty_space will be bigger than the space actually available. Since new_wr_idx is not checked, so the following code will result in an OOB write. ... qsize = qhdr->q_size if (wr_idx >= rd_idx) empty_space = qsize - (wr_idx - rd_idx) .... if (new_wr_idx < qsize) { memcpy(wr_ptr, packet, dwords << 2) --> OOB write Add check to ensure qsize is within the allocated size while reading and writing packets into the queue. Cc: stable@vger.kernel.org Fixes: d96d3f30c0f2 ("[media] media: venus: hfi: add Venus HFI files") Reviewed-by: Bryan O'Donoghue Signed-off-by: Vikash Garodia Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/hfi_venus.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -187,6 +187,9 @@ static int venus_write_queue(struct venu /* ensure rd/wr indices's are read from memory */ rmb(); + if (qsize > IFACEQ_QUEUE_SIZE / 4) + return -EINVAL; + if (wr_idx >= rd_idx) empty_space = qsize - (wr_idx - rd_idx); else @@ -255,6 +258,9 @@ static int venus_read_queue(struct venus wr_idx = qhdr->write_idx; qsize = qhdr->q_size; + if (qsize > IFACEQ_QUEUE_SIZE / 4) + return -EINVAL; + /* make sure data is valid before using it */ rmb();