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 69C7A1D7E35; Tue, 29 Apr 2025 17:45:16 +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=1745948716; cv=none; b=X2fCe+BiVtP2JaMbAzYLjr14Q+gRQqrjxLIb6qHZPXwkOUonbCQXvpGssXugJEW6zMJQBcqGaTMDrMD9xv7h0ZPFWo4S6Hk/S6xcSKaWqPSPmjq5mjivXHopvIWkPPHLKUnS32mBPitbzZIzIVswQmiKey4P8T/06BvaRgS9xkM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745948716; c=relaxed/simple; bh=a0barJ5Ic9R2xok7rAx3tBdXlNlKZUH0G9t80ZPRBDQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UfoLS1WWTJtJScds9MYJrip9hz9RYwVRaRrjLbUV2Zn5izeXetfjgIJmHA/eBvwOW4IR8pXeaFtFTYpTmWYYGkOlWab3XNCMmrgTRtuzCoNbdaIHvTqJhkujyCGzxxC8FH4oA3lnhYRaQxTKIxbjNLltg8vZlk6oSWW2WXOQvKQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EGu5ozAB; 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="EGu5ozAB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D18A8C4CEE9; Tue, 29 Apr 2025 17:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745948716; bh=a0barJ5Ic9R2xok7rAx3tBdXlNlKZUH0G9t80ZPRBDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EGu5ozABEvSGuUf0+LgWI2CVbF35cxWuPO6ROs87qbLkNYNiDIbe/WMAmPd5BIXGv //Ku1FLdsxeRAlF30HTDMYDJ2eJ/4QQH4HJFawyTGInPlp6SWdBsn3CEiI0+UZhA++ h8hoi2QQ7toEPmR+NHk6S72ZADyswulQylBwT25c= 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 5.15 060/373] media: venus: hfi: add check to handle incorrect queue size Date: Tue, 29 Apr 2025 18:38:57 +0200 Message-ID: <20250429161125.594068618@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161123.119104857@linuxfoundation.org> References: <20250429161123.119104857@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 5.15-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();