From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Andrzej Pietrasiewicz <andrzej.p@collabora.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Subject: [PATCH AUTOSEL 5.10 38/70] media: cedrus: Fix .buf_prepare
Date: Sun, 4 Jul 2021 19:07:31 -0400 [thread overview]
Message-ID: <20210704230804.1490078-38-sashal@kernel.org> (raw)
In-Reply-To: <20210704230804.1490078-1-sashal@kernel.org>
From: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
[ Upstream commit d84b9202d712309840f8b5abee0ed272506563bd ]
The driver should only set the payload on .buf_prepare if the
buffer is CAPTURE type. If an OUTPUT buffer has a zero bytesused
set by userspace then v4l2-core will set it to buffer length.
If we overwrite bytesused for OUTPUT buffers, too, then
vb2_get_plane_payload() will return incorrect value which might be then
written to hw registers by the driver in cedrus_h264.c or cedrus_vp8.c.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/staging/media/sunxi/cedrus/cedrus_video.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index 911f607d9b09..16327be904d1 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -449,7 +449,13 @@ static int cedrus_buf_prepare(struct vb2_buffer *vb)
if (vb2_plane_size(vb, 0) < pix_fmt->sizeimage)
return -EINVAL;
- vb2_set_plane_payload(vb, 0, pix_fmt->sizeimage);
+ /*
+ * Buffer's bytesused must be written by driver for CAPTURE buffers.
+ * (for OUTPUT buffers, if userspace passes 0 bytesused, v4l2-core sets
+ * it to buffer length).
+ */
+ if (V4L2_TYPE_IS_CAPTURE(vq->type))
+ vb2_set_plane_payload(vb, 0, pix_fmt->sizeimage);
return 0;
}
--
2.30.2
next prev parent reply other threads:[~2021-07-04 23:12 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-04 23:06 [PATCH AUTOSEL 5.10 01/70] spi: Make of_register_spi_device also set the fwnode Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 02/70] Add a reference to ucounts for each cred Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 03/70] staging: media: rkvdec: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 04/70] media: marvel-ccic: fix some issues when getting pm_runtime Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 05/70] media: mdk-mdp: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 06/70] media: s5p: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 07/70] media: am437x: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 08/70] media: sh_vou: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 09/70] media: mtk-vcodec: fix PM runtime get logic Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 10/70] media: s5p-jpeg: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 11/70] media: sunxi: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 12/70] media: sti/bdisp: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 13/70] media: exynos4-is: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 14/70] media: exynos-gsc: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 15/70] spi: spi-loopback-test: Fix 'tx_buf' might be 'rx_buf' Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 16/70] spi: spi-topcliff-pch: Fix potential double free in pch_spi_process_messages() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 17/70] spi: omap-100k: Fix the length judgment problem Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 18/70] regulator: uniphier: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 19/70] sched/core: Initialize the idle task with preemption disabled Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 20/70] hwrng: exynos - Fix runtime PM imbalance on error Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 21/70] crypto: nx - add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 22/70] regmap-i2c: Set regmap max raw r/w from quirks Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 23/70] media: sti: fix obj-$(config) targets Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 24/70] media: cpia2: fix memory leak in cpia2_usb_probe Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 25/70] media: cobalt: fix race condition in setting HPD Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 26/70] media: hevc: Fix dependent slice segment flags Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 27/70] media: pvrusb2: fix warning in pvr2_i2c_core_done Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 28/70] media: imx: imx7_mipi_csis: Fix logging of only error event counters Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 29/70] crypto: qat - check return code of qat_hal_rd_rel_reg() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 30/70] crypto: qat - remove unused macro in FW loader Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 31/70] crypto: qce: skcipher: Fix incorrect sg count for dma transfers Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 32/70] arm64: perf: Convert snprintf to sysfs_emit Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 33/70] sched/fair: Fix ascii art by relpacing tabs Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 34/70] media: i2c: ov2659: Use clk_{prepare_enable,disable_unprepare}() to set xvclk on/off Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 35/70] media: bt878: do not schedule tasklet when it is not setup Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 36/70] media: em28xx: Fix possible memory leak of em28xx struct Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 37/70] media: hantro: Fix .buf_prepare Sasha Levin
2021-07-04 23:07 ` Sasha Levin [this message]
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 39/70] media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 40/70] media: bt8xx: Fix a missing check bug in bt878_probe Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 41/70] media: st-hva: Fix potential NULL pointer dereferences Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 42/70] crypto: hisilicon/sec - fixup 3des minimum key size declaration Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 43/70] Makefile: fix GDB warning with CONFIG_RELR Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 44/70] media: dvd_usb: memory leak in cinergyt2_fe_attach Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 45/70] memstick: rtsx_usb_ms: fix UAF Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 46/70] mmc: sdhci-sprd: use sdhci_sprd_writew Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 47/70] mmc: via-sdmmc: add a check against NULL pointer dereference Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 48/70] spi: meson-spicc: fix a wrong goto jump for avoiding memory leak Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 49/70] spi: meson-spicc: fix memory leak in meson_spicc_probe Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 50/70] crypto: shash - avoid comparing pointers to exported functions under CFI Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 51/70] media: dvb_net: avoid speculation from net slot Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 52/70] media: siano: fix device register error path Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 53/70] media: imx-csi: Skip first few frames from a BT.656 source Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 54/70] hwmon: (max31790) Report correct current pwm duty cycles Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 55/70] hwmon: (max31790) Fix pwmX_enable attributes Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 56/70] drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 57/70] KVM: PPC: Book3S HV: Fix TLB management on SMT8 POWER9 and POWER10 processors Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 58/70] btrfs: fix error handling in __btrfs_update_delayed_inode Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 59/70] btrfs: abort transaction if we fail to update the delayed inode Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 60/70] btrfs: sysfs: fix format string for some discard stats Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 61/70] btrfs: make Private2 lifespan more consistent Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 62/70] btrfs: fix the filemap_range_has_page() call in btrfs_punch_hole_lock_range() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 63/70] btrfs: don't clear page extent mapped if we're not invalidating the full page Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 64/70] btrfs: disable build on platforms having page size 256K Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 65/70] locking/lockdep: Fix the dep path printing for backwards BFS Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 66/70] lockding/lockdep: Avoid to find wrong lock dep path in check_irq_usage() Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 67/70] KVM: s390: get rid of register asm usage Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 68/70] regulator: mt6358: Fix vdram2 .vsel_mask Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 69/70] regulator: da9052: Ensure enough delay time for .set_voltage_time_sel Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 70/70] media: Fix Media Controller API config checks Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210704230804.1490078-38-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=andrzej.p@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab+huawei@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).