From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794062830; b=tdfs+dSnHCs06uAHmuOi6d/ae+k1MTWh9YjdQKMb3EyF67MM7OP+g9VhJHSnNL0eWUkI 5OblN/Q/pcJnGs+TfTxvOfrW57eg9kCIUjfy1atCcoEDJssA+m/SN59Br5fJ5l7WnGKcK pv29AJ0WgdF5oKp+TANCyVVlAACXvzwfpYpbL1NqdjtUoOjFjG/TkERI9zRxN8OnDRUkG pm9zUiD1hi6SmGgYRA+S/y1P/34346UiYlnhpyNhzqCMNgX6rE3gALiGY9i4M0IA7xqoN 2J49dkz2BFpbsPYvKUVPmC2lYgv+pYSCUbbrAsJ5QV7A312au84/tV5ZgTfSs6l5mCQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794062830; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=9J7QSTwx/DtlEc7/pxVdnxVbR56zG643jYg8pcM4LvY=; b=TUZTkVCjhxaPPSsUVFn68w2cvK7rPvG9S2kUJQ1bny1JOiNmf39KiMie8mNEOyUEBRJb 6cnjiLj1xrcFIkKtCtHa4g0ER2jAPzqAeSWtTR62cJBr0oJaoC4etssl77DJYS5EM8MEK CpTg2GOlB+w7zhrJBfkMbEMA1BGTF8rgBPjb5n69ra8L2Q1NIX8gb5OACZ6zrx6xSiXPY x1V/Eb8YT9Fsry+XwvaDRBCsnOpe1YwC1khndTW6AMnJReRmIxTmgA0wkpzipgUYyGVQn uk+7w12DHmXMp+8viN9Vnw/iD04s6ftxelfEpuyjwvi0v/baNa1GTgrgUql4LgyBUNA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=vX6jXmG4; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C348B606A33E; Sat, 7 Nov 2026 14:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=vX6jXmG4 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71E311F0089F; Sat, 7 Nov 2026 14:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794062829; bh=9J7QSTwx/DtlEc7/pxVdnxVbR56zG643jYg8pcM4LvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vX6jXmG4+pYFX+gvAybcyuU04FqhY7Udzm4SstYRD16n17uDx++RYnQQRLHslpzZh 3CLtQorwy37kJhR1riXfzIrCYYVBXl7HAOm9ZL/zclNOl3OI3ueDIy7MZYNLBhfIqa a82w6uCwA2hLwKxQ8yI1ruBL4FQ388l/SNc136Tc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuhao Jiang , Junrui Luo , Hans Verkuil , Sasha Levin Subject: [PATCH 6.18 086/869] media: vicodec: make encoder CAPTURE dimensions read-only Date: Sat, 7 Nov 2026 08:46:08 -0500 Message-ID: <20261107134855.654592544@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Junrui Luo [ Upstream commit 2532e9d2f8ccb330a9c924b1ee34c5629240d352 ] Setting the encoder's compressed CAPTURE format to a smaller resolution than the raw OUTPUT format makes the encoder write past the end of the CAPTURE buffer. For a stateful encoder the CAPTURE width and height are not client-settable; Documentation/userspace-api/media/v4l/dev-encoder.rst specifies them as "ignored (read-only)" on VIDIOC_S_FMT. vicodec only implements half of that: vidioc_s_fmt_vid_out() derives the CAPTURE coded size and sizeimage from the OUTPUT format, but S_FMT on the CAPTURE queue overwrites them. The encoder then takes its geometry from the OUTPUT queue alone, and v4l2_fwht_encode() gets no destination length. Overwrite the requested width and height with the OUTPUT queue's coded dimensions in vidioc_try_fmt_vid_cap(), making them read-only as the interface requires. Fixes: efec9c815e5d ("media: vicodec: pass on enc output format to capture side") Reported-by: Yuhao Jiang Assisted-by: Claude:claude-opus-5 Cc: stable@vger.kernel.org Signed-off-by: Junrui Luo Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/test-drivers/vicodec/vicodec-core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/media/test-drivers/vicodec/vicodec-core.c b/drivers/media/test-drivers/vicodec/vicodec-core.c index 654da27b11406..cdc3af33b4bbe 100644 --- a/drivers/media/test-drivers/vicodec/vicodec-core.c +++ b/drivers/media/test-drivers/vicodec/vicodec-core.c @@ -893,6 +893,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { struct vicodec_ctx *ctx = file2ctx(file); + struct vicodec_q_data *q_data_out = + get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT); struct v4l2_pix_format_mplane *pix_mp; struct v4l2_pix_format *pix; @@ -903,6 +905,10 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, pix = &f->fmt.pix; pix->pixelformat = ctx->is_enc ? V4L2_PIX_FMT_FWHT : find_fmt(f->fmt.pix.pixelformat)->id; + if (ctx->is_enc) { + pix->width = q_data_out->coded_width; + pix->height = q_data_out->coded_height; + } pix->colorspace = ctx->state.colorspace; pix->xfer_func = ctx->state.xfer_func; pix->ycbcr_enc = ctx->state.ycbcr_enc; @@ -914,6 +920,10 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, pix_mp = &f->fmt.pix_mp; pix_mp->pixelformat = ctx->is_enc ? V4L2_PIX_FMT_FWHT : find_fmt(pix_mp->pixelformat)->id; + if (ctx->is_enc) { + pix_mp->width = q_data_out->coded_width; + pix_mp->height = q_data_out->coded_height; + } pix_mp->colorspace = ctx->state.colorspace; pix_mp->xfer_func = ctx->state.xfer_func; pix_mp->ycbcr_enc = ctx->state.ycbcr_enc; -- 2.53.0