From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C0612D738A for ; Fri, 8 May 2026 04:53:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778216019; cv=none; b=CjzOqZIvTr2x7sSe3l7njLJvChZXhWftfrGTGdgecRyjTGykOeIRRJjBVSg9U/zUQ4OmVOhHM4iHUGiYE1Vzf/6LpnV6nsHCyj0lrxb4S7tFc0V0F4Dv0Q62/YQ2kfVL/yvXY1vhtow9dwIhQEv9rkE47vq9mVvVPYczYhwqeFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778216019; c=relaxed/simple; bh=iwMVIutDdnDY2VlIdGAfHBAMEdmf3NNOAqSKgNJVqmA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=s2evaT9rLMoNkVD+x2d0LbA00Ho5lmMWdzZmnMNioSlzGZz02ZjB5hErdvAti5A6hkB1aEyYydrqW0WmaD9hKRddOJNV7Fb4XzaKrb7zj8n7AfbJ1LN9Hgjme3vcyyNpg4OmqJECQ/d0aIEUacGJUDqKbcrApvvaDKCGIfVfi98= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MmTxVs2y; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MmTxVs2y" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-67389cf78b0so2893286a12.2 for ; Thu, 07 May 2026 21:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778216016; x=1778820816; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qPdNBnuNDaZZUCAN8oqndatEOhhJRZbEt+zuRV2X6ME=; b=MmTxVs2ygz544e2D6xj34DLwdi6vEvMEnYXhP+JFclJhE+4RA+chel299KRK2mIcsU /J6WTd4/1FFLvrgIHv2jCGLCH2wLt7sMQrPa/1IU+bxn0FpDmprmgoPv/4JoVvRzQOZH NH7kEs3+KYmVJmQOMqbR2jZ1oBEc5u1wQ1rA042L8qqMKmQ3FzL407AUF+3qLWD8e+Ej EPxqmm2L29hXXROPJkPrhSwdRuZeHI9lzaKXx3+RgDqkFACBadJD88ClMurrxc9Eedvw QFmuI84fN18DBztGvwWMjk01C4+pVOoYrKRo1yHUdaCxUxfbgyHx/QP/4QIclnHhQL3D HHYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778216016; x=1778820816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qPdNBnuNDaZZUCAN8oqndatEOhhJRZbEt+zuRV2X6ME=; b=euSXz9gAcu5YzZQT2pkCJolnAtL67AZKGPZLMRAx28gkIyG0SK4Avho2XNPsky1Z9S f5JKFnXAdBc1CZuDOD8Pi9DSDZh7C5rm8tt2E+rSAUp9daHAdxMT1IFrkkEUGmn+sHpi XG1utEOuP6lkAUCF/GsgowkgeOFQno9owZuhMuuTElpis+rLhfWO166PiPBKcbT8e0EM TEUQceBr2nv7x1l0ptDV6VeoSkckIlwZ0m2wy8QEbPJ3QmSn/XumnlpbFvQ63vBu48kQ bZIRpacRC47kbZuJ/oufVcUczjn1StIDXRsKCWB03GuIgGEpBoJVGoOz8UOySgorps3Q r7qw== X-Forwarded-Encrypted: i=1; AFNElJ+AoG6ilv1XM7czOWEt5tsVDPtCfvoRIWweriUFXCR4FwzWWwkS/KLD5TJO4PIVfHYUkS2rpHbFzHnp87E=@vger.kernel.org X-Gm-Message-State: AOJu0YyMM43gdXqJxZftj5ft1cVok2YwTZdnvVSvXNfhPXd+kNyYbkAb kKh7lOAfThw4mUzk0usBBy0La+24E8+fWxp5JQO0yzc2ZuRD4SJjHhSi X-Gm-Gg: Acq92OEskfqEHVzQylW7K+AEQFRtXawWrL2cVdwSr26b5GE+O7cXui+JOgN8WSWovDQ A0OII/1HEdqiDizKbzKaMgwb43C2wFRjcAarGPWwiGt9U5yac6tintt4SFYb8YLuU63XE7jIN14 SmXD99G75qpmkTvqPZc7sF0xb5qBkGdOjN3l/I70AllLmMAQG/cGUG5zev7RQstEClQrPNcuvyx JO9/9s7pWr3ZCL+InT2Opv2w7eXxAastIvx58aGloKgmtcbtDR788anpoi4MTKti1r9eZhRVicK vVUUK0b6P0jpsNDzotLWSAWKgxCU5Uf91a+MOW/u6FIwNQtbpIS/xJzAJDioUWWvQpfXTbgxUX7 Tg3oyl3apnsC6EgFif3aRW+J8ZuOavJGXU472s/cRkl9zbZnTADZg5Hb0RrSMpfBuGj5nME+n7l VQhWDttdb8L1Qx0vI1urD5VH8= X-Received: by 2002:a05:6402:5414:b0:672:7109:61a0 with SMTP id 4fb4d7f45d1cf-67ef0687822mr450598a12.9.1778216015715; Thu, 07 May 2026 21:53:35 -0700 (PDT) Received: from avt74j0.. ([2a02:8109:8617:d700:d9bb:cdec:69e5:2f8e]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-67ef0e1a221sm163332a12.24.2026.05.07.21.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 21:53:35 -0700 (PDT) From: Martin Hecht To: Cc: sakari.ailus@linux.intel.com, martin.hecht@avnet.eu, michael.roeder@avnet.eu, stable@vger.kernel.org, Martin Hecht , Tommaso Merciai , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] media: i2c: alvium: fix critical pointer access in alvium_ctrl_init Date: Fri, 8 May 2026 06:53:28 +0200 Message-ID: <20260508045332.360004-1-mhecht73@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The current implementation of alvium_ctrl_init creates several controls in function alvium_ctrl_init and uses the returned pointer without check. That can cause write access over NULL-pointer for several controls. The reworked code checks the pointers before adding flags and also it creates controls for V4L2_CID_BLUE_BALANCE and V4L2_CID_RED_BALANCE only if supported by the particular camera model. Fixes: 0a7af872915e ("media: i2c: Add support for alvium camera") Cc: stable@vger.kernel.org Signed-off-by: Martin Hecht --- drivers/media/i2c/alvium-csi2.c | 72 +++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c index b62b45a4f2fc..43535ba7a264 100644 --- a/drivers/media/i2c/alvium-csi2.c +++ b/drivers/media/i2c/alvium-csi2.c @@ -2100,34 +2100,41 @@ static int alvium_ctrl_init(struct alvium_dev *alvium) V4L2_CID_PIXEL_RATE, 0, ALVIUM_DEFAULT_PIXEL_RATE_MHZ, 1, ALVIUM_DEFAULT_PIXEL_RATE_MHZ); - ctrls->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY; + if (ctrls->pixel_rate) + ctrls->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY; /* Link freq is fixed */ ctrls->link_freq = v4l2_ctrl_new_int_menu(hdl, ops, V4L2_CID_LINK_FREQ, 0, 0, &alvium->link_freq); - ctrls->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY; - - /* Auto/manual white balance */ + if (ctrls->link_freq) + ctrls->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY; + + /* manual white balance */ + if (alvium->avail_ft.whiteb) { + ctrls->blue_balance = v4l2_ctrl_new_std(hdl, ops, + V4L2_CID_BLUE_BALANCE, + alvium->min_bbalance, + alvium->max_bbalance, + alvium->inc_bbalance, + alvium->dft_bbalance); + + ctrls->red_balance = v4l2_ctrl_new_std(hdl, ops, + V4L2_CID_RED_BALANCE, + alvium->min_rbalance, + alvium->max_rbalance, + alvium->inc_rbalance, + alvium->dft_rbalance); + } + + /* Auto white balance */ if (alvium->avail_ft.auto_whiteb) { ctrls->auto_wb = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1); - v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false); - } - - ctrls->blue_balance = v4l2_ctrl_new_std(hdl, ops, - V4L2_CID_BLUE_BALANCE, - alvium->min_bbalance, - alvium->max_bbalance, - alvium->inc_bbalance, - alvium->dft_bbalance); - ctrls->red_balance = v4l2_ctrl_new_std(hdl, ops, - V4L2_CID_RED_BALANCE, - alvium->min_rbalance, - alvium->max_rbalance, - alvium->inc_rbalance, - alvium->dft_rbalance); + if (ctrls->auto_wb) + v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false); + } /* Auto/manual exposure */ if (alvium->avail_ft.auto_exp) { @@ -2136,7 +2143,9 @@ static int alvium_ctrl_init(struct alvium_dev *alvium) V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO); - v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true); + if (ctrls->auto_exp) + v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, + V4L2_EXPOSURE_MANUAL, true); } ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, @@ -2145,15 +2154,8 @@ static int alvium_ctrl_init(struct alvium_dev *alvium) alvium->max_exp, alvium->inc_exp, alvium->dft_exp); - ctrls->exposure->flags |= V4L2_CTRL_FLAG_VOLATILE; - - /* Auto/manual gain */ - if (alvium->avail_ft.auto_gain) { - ctrls->auto_gain = v4l2_ctrl_new_std(hdl, ops, - V4L2_CID_AUTOGAIN, - 0, 1, 1, 1); - v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true); - } + if (ctrls->exposure) + ctrls->exposure->flags |= V4L2_CTRL_FLAG_VOLATILE; if (alvium->avail_ft.gain) { ctrls->gain = v4l2_ctrl_new_std(hdl, ops, @@ -2162,7 +2164,17 @@ static int alvium_ctrl_init(struct alvium_dev *alvium) alvium->max_gain, alvium->inc_gain, alvium->dft_gain); - ctrls->gain->flags |= V4L2_CTRL_FLAG_VOLATILE; + if (ctrls->gain) + ctrls->gain->flags |= V4L2_CTRL_FLAG_VOLATILE; + } + + /* Auto/manual gain */ + if (alvium->avail_ft.auto_gain) { + ctrls->auto_gain = v4l2_ctrl_new_std(hdl, ops, + V4L2_CID_AUTOGAIN, + 0, 1, 1, 1); + if (ctrls->auto_gain) + v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true); } if (alvium->avail_ft.sat) -- 2.43.0