| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250816170603.41051-1-abdelrahmanfekry375@gmail.com>
Date: Sat, 16 Aug 2025 20:06:03 +0300
From: Abdelrahman Fekry <abdelrahmanfekry375@...il.com>
To: hansg@...nel.org,
mchehab@...nel.org,
sakari.ailus@...ux.intel.com,
andy@...nel.org,
gregkh@...uxfoundation.org
Cc: linux-media@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-staging@...ts.linux.dev,
linux-kernel-mentees@...ts.linux.dev,
skhan@...uxfoundation.org,
dan.carpenter@...aro.org,
Abdelrahman Fekry <abdelrahmanfekry375@...il.com>,
Hans de Goede <hdegoede@...hat.com>
Subject: [PATCH v3] staging: media: atomisp: Add lock asserts for various functions
Add lockdep_assert_held(&isp->mutex) to critical functions accessing
shared device state. This enforces proper locking and detects violations.
Suggested-by: Hans de Goede <hdegoede@...hat.com>
Signed-off-by: Abdelrahman Fekry <abdelrahmanfekry375@...il.com>
---
v3:
- modify declarations to match kernel style
v2: https://lore.kernel.org/all/20250815182411.36092-1-abdelrahmanfekry375@gmail.com/
- Fix Typos
- tested by building the driver
v1: https://lore.kernel.org/all/20250815170901.32105-1-abdelrahmanfekry375@gmail.com/
.../staging/media/atomisp/pci/atomisp_cmd.c | 3 ++
.../media/atomisp/pci/atomisp_compat_css20.c | 28 +++++++++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 3a4eb4f6d3be..fc5c8276b013 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -3706,6 +3706,7 @@ static int atomisp_set_sensor_crop_and_fmt(struct atomisp_device *isp,
struct v4l2_subdev_state *sd_state;
int ret = 0;
+ lockdep_assert_held(&isp->mutex);
if (!input->sensor)
return -EINVAL;
@@ -3800,6 +3801,7 @@ int atomisp_try_fmt(struct atomisp_device *isp, struct v4l2_pix_format *f,
u32 padding_w, padding_h;
int ret;
+ lockdep_assert_held(&isp->mutex);
fmt = atomisp_get_format_bridge(f->pixelformat);
/* Currently, raw formats are broken!!! */
if (!fmt || fmt->sh_fmt == IA_CSS_FRAME_FORMAT_RAW) {
@@ -4334,6 +4336,7 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
struct v4l2_rect isp_sink_crop;
int ret;
+ lockdep_assert_held(&isp->mutex);
ret = atomisp_pipe_check(pipe, true);
if (ret)
return ret;
diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index be5f37f4a6fd..03067479dd69 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -1447,9 +1447,11 @@ int atomisp_css_input_set_resolution(struct atomisp_sub_device *asd,
enum atomisp_input_stream_id stream_id,
struct v4l2_mbus_framefmt *ffmt)
{
+ struct atomisp_device *isp = asd->isp;
struct ia_css_stream_config *s_config =
- &asd->stream_env[stream_id].stream_config;
+ &asd->stream_env[stream_id].stream_config;
+ lockdep_assert_held(&isp->mutex);
s_config->input_config.input_res.width = ffmt->width;
s_config->input_config.input_res.height = ffmt->height;
return 0;
@@ -1519,6 +1521,10 @@ int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd,
enum atomisp_input_stream_id stream_id,
struct v4l2_mbus_framefmt *ffmt)
{
+ struct atomisp_device *isp = asd->isp;
+
+ lockdep_assert_held(&isp->mutex);
+
int i;
struct ia_css_stream_config *s_config =
&asd->stream_env[stream_id].stream_config;
@@ -1621,6 +1627,9 @@ void atomisp_css_input_set_two_pixels_per_clock(
void atomisp_css_enable_dz(struct atomisp_sub_device *asd, bool enable)
{
+ struct atomisp_device *isp = asd->isp;
+
+ lockdep_assert_held(&isp->mutex);
int i;
for (i = 0; i < IA_CSS_PIPE_ID_NUM; i++)
@@ -1631,9 +1640,11 @@ void atomisp_css_enable_dz(struct atomisp_sub_device *asd, bool enable)
void atomisp_css_capture_set_mode(struct atomisp_sub_device *asd,
enum ia_css_capture_mode mode)
{
+ struct atomisp_device *isp = asd->isp;
struct atomisp_stream_env *stream_env =
- &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL];
+ &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL];
+ lockdep_assert_held(&isp->mutex);
if (stream_env->pipe_configs[IA_CSS_PIPE_ID_CAPTURE]
.default_capture_config.mode == mode)
return;
@@ -1646,6 +1657,9 @@ void atomisp_css_capture_set_mode(struct atomisp_sub_device *asd,
void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
enum ia_css_input_mode mode)
{
+ struct atomisp_device *isp = asd->isp;
+
+ lockdep_assert_held(&isp->mutex);
unsigned int size_mem_words;
int i;
@@ -1690,9 +1704,11 @@ void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
void atomisp_css_capture_enable_online(struct atomisp_sub_device *asd,
unsigned short stream_index, bool enable)
{
+ struct atomisp_device *isp = asd->isp;
struct atomisp_stream_env *stream_env =
&asd->stream_env[stream_index];
+ lockdep_assert_held(&isp->mutex);
if (stream_env->stream_config.online == !!enable)
return;
@@ -1726,6 +1742,9 @@ int atomisp_css_input_configure_port(
{
int i;
struct atomisp_stream_env *stream_env;
+ struct atomisp_device *isp = asd->isp;
+
+ lockdep_assert_held(&isp->mutex);
/*
* Calculate rx_count as follows:
* Input: mipi_freq : CSI-2 bus frequency in Hz
@@ -1760,9 +1779,11 @@ int atomisp_css_input_configure_port(
void atomisp_css_stop(struct atomisp_sub_device *asd, bool in_reset)
{
+ struct atomisp_device *isp = asd->isp;
unsigned long irqflags;
unsigned int i;
+ lockdep_assert_held(&isp->mutex);
/*
* CSS 2.0 API limitation: ia_css_stop_sp() can only be called after
* destroying all pipes.
@@ -1815,6 +1836,9 @@ void atomisp_css_continuous_set_num_raw_frames(
struct atomisp_sub_device *asd,
int num_frames)
{
+ struct atomisp_device *isp = asd->isp;
+
+ lockdep_assert_held(&isp->mutex);
if (asd->enable_raw_buffer_lock->val) {
asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL]
.stream_config.init_num_cont_raw_buf =
--
2.25.1
Powered by blists - more mailing lists