FAILED: patch "[PATCH] iio: light: as73211: Ensure buffer holes are zeroed" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 433b99e922943efdfd62b9a8e3ad1604838181f2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082316-antennae-resurrect-e01a@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 433b99e922943efdfd62b9a8e3ad1604838181f2 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <[email protected]>
Date: Sat, 2 Aug 2025 17:44:21 +0100
Subject: [PATCH] iio: light: as73211: Ensure buffer holes are zeroed
Given that the buffer is copied to a kfifo that ultimately user space can read, ensure we zero it.
drivers/iio/light/as73211.c +1 -1
@@ -639,7 +639,7 @@ static irqreturn_t as73211_trigger_handler(int irq __always_unused, void *p)struct {__le16 chan[4 ];aligned_s64 ts; - } scan; + } scan = { };int data_result, ret;mutex_lock (&data->mutex);
Sasha Levin
maintainerPATCH 1/2 iio: light: Use aligned_s64 instead of open coding alignment.
From: Jonathan Cameron <[email protected]>
[ Upstream commit a801016da0bbb955acf1a551584790e3816bb4db ]
Use this new type to both slightly simplify the code and avoid confusing static analysis tools. Mostly this series is about consistency to avoid this code pattern getting copied into more drivers.
Stable-dep-of: 433b99e92294 ("iio: light: as73211: Ensure buffer holes are zeroed")
--- drivers/iio/light/adjd_s311.c | 2 +- drivers/iio/light/as73211.c | 2 +- drivers/iio/light/bh1745.c | 2 +- drivers/iio/light/isl29125.c | 2 +- drivers/iio/light/ltr501.c | 2 +- drivers/iio/light/max44000.c | 2 +- drivers/iio/light/rohm-bu27034.c | 2 +- drivers/iio/light/rpr0521.c | 2 +- drivers/iio/light/st_uvis25.h | 2 +- drivers/iio/light/tcs3414.c | 2 +- drivers/iio/light/tcs3472.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
drivers/iio/light/adjd_s311.c +1 -1
@@ -56,7 +56,7 @@ struct adjd_s311_data {struct i2c_client *client;struct {s16 chans[4 ]; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan; };
drivers/iio/light/as73211.c +1 -1
@@ -642,7 +642,7 @@ static irqreturn_t as73211_trigger_handler(int irq __always_unused, void *p)struct as73211_data *data =iio_priv (indio_dev);struct {__le16 chan[4 ]; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan;int data_result, ret;
drivers/iio/light/bh1745.c +1 -1
@@ -743,7 +743,7 @@ static irqreturn_t bh1745_trigger_handler(int interrupt, void *p)struct bh1745_data *data =iio_priv (indio_dev);struct {u16 chans[4 ]; -s64 timestamp__aligned(8) ; +aligned_s64 timestamp; } scan;u16 value;int ret;
drivers/iio/light/isl29125.c +1 -1
@@ -54,7 +54,7 @@ struct isl29125_data {/* Ensure timestamp is naturally aligned */ struct {u16 chans[3 ]; -s64 timestamp__aligned(8) ; +aligned_s64 timestamp; } scan; };
drivers/iio/light/ltr501.c +1 -1
@@ -1285,7 +1285,7 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)struct ltr501_data *data =iio_priv (indio_dev);struct {u16 channels[3 ]; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan;__le16 als_buf[2 ];u8 mask =0 ;
drivers/iio/light/max44000.c +1 -1
@@ -78,7 +78,7 @@ struct max44000_data {/* Ensure naturally aligned timestamp */ struct {u16 channels[2 ]; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan; };
drivers/iio/light/rohm-bu27034.c +1 -1
@@ -205,7 +205,7 @@ struct bu27034_data {struct {u32 mlux;__le16 channels[BU27034_NUM_HW_DATA_CHANS ]; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan; };
drivers/iio/light/rpr0521.c +1 -1
@@ -203,7 +203,7 @@ struct rpr0521_data {struct {__le16 channels[3 ];u8 garbage; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan; };
drivers/iio/light/st_uvis25.h +1 -1
@@ -30,7 +30,7 @@ struct st_uvis25_hw {/* Ensure timestamp is naturally aligned */ struct {u8 chan; -s64 ts__aligned(8) ; +aligned_s64 ts; } scan; };
drivers/iio/light/tcs3414.c +1 -1
@@ -56,7 +56,7 @@ struct tcs3414_data {/* Ensure timestamp is naturally aligned */ struct {u16 chans[4 ]; -s64 timestamp__aligned(8) ; +aligned_s64 timestamp; } scan; };
drivers/iio/light/tcs3472.c +1 -1
@@ -67,7 +67,7 @@ struct tcs3472_data {/* Ensure timestamp is naturally aligned */ struct {u16 chans[4 ]; -s64 timestamp__aligned(8) ; +aligned_s64 timestamp; } scan; };
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 2/2 iio: light: as73211: Ensure buffer holes are zeroed
From: Jonathan Cameron <[email protected]>
[ Upstream commit 433b99e922943efdfd62b9a8e3ad1604838181f2 ]
Given that the buffer is copied to a kfifo that ultimately user space can read, ensure we zero it.
--- drivers/iio/light/as73211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/light/as73211.c +1 -1
@@ -643,7 +643,7 @@ static irqreturn_t as73211_trigger_handler(int irq __always_unused, void *p)struct {__le16 chan[4 ];aligned_s64 ts; - } scan; + } scan = { };int data_result, ret;mutex_lock (&data->mutex);
Signature · 1 line
2.50.1