Input: rmi4 - change reg_size type to u32

Change reg_size from unsigned long to u32 to save space and ensure
consistent size across 32-bit and 64-bit architectures, and use
DECLARE_BITMAP() for subpacket_map.

Also pack the structure by rearranging the members to avoid holes,
and use size_add() to prevent potential integer overflows when
calculating the total size of registers.

Assisted-by: Gemini:gemini-3.1-pro
Link: https://patch.msgid.link/20260505045952.1570713-13-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/rmi4/rmi_2d_sensor.h b/drivers/input/rmi4/rmi_2d_sensor.h
index 61a99c8a7a26847df1fe19f46893e6da8f29ca1f..f9d9c1dd5eb071e122fac3f4e9a9bd20b99ff196 100644 (file)
--- a/drivers/input/rmi4/rmi_2d_sensor.h
+++ b/drivers/input/rmi4/rmi_2d_sensor.h
@@ -56,8 +56,8 @@ struct rmi_2d_sensor {
        u16 max_y;
        u8 nbr_fingers;
        u8 *data_pkt;
-       int pkt_size;
-       int attn_size;
+       u32 pkt_size;
+       u32 attn_size;
        bool topbuttonpad;
        enum rmi_sensor_type sensor_type;
        struct input_dev *input;

diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 2ac82cd3ff6d4889d3d9dd3f890c5c01eac34301..49a59da6a84111fb812064a91140aa59e2f4db1c 100644 (file)
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -713,7 +713,7 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr,
                offset += item_size;
 
                rmi_dbg(RMI_DEBUG_CORE, &d->dev,
-                       "%s: reg: %d reg size: %ld subpackets: %d\n", __func__,
+                       "%s: reg: %d reg size: %u subpackets: %d\n", __func__,
                        item->reg, item->reg_size, item->num_subpackets);
 
                reg = find_next_bit(presence_map,
@@ -746,7 +746,7 @@ size_t rmi_register_desc_calc_size(struct rmi_register_descriptor *rdesc)
 
        for (i = 0; i < rdesc->num_registers; i++) {
                item = &rdesc->registers[i];
-               size += item->reg_size;
+               size = size_add(size, item->reg_size);
        }
        return size;
 }

diff --git a/drivers/input/rmi4/rmi_driver.h b/drivers/input/rmi4/rmi_driver.h
index b93905a6a43ae4616a9314d7845a00169a084470..abeafb77a4838c1430b751836c6eabea24211bba 100644 (file)
--- a/drivers/input/rmi4/rmi_driver.h
+++ b/drivers/input/rmi4/rmi_driver.h
@@ -52,11 +52,10 @@ struct pdt_entry {
 
 /* describes a single packet register */
 struct rmi_register_desc_item {
+       u32 reg_size;
        u16 reg;
-       unsigned long reg_size;
        u16 num_subpackets;
-       unsigned long subpacket_map[BITS_TO_LONGS(
-                               RMI_REG_DESC_SUBPACKET_BITS)];
+       DECLARE_BITMAP(subpacket_map, RMI_REG_DESC_SUBPACKET_BITS);
 };
 
 /*

diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index 49ca9168685a028c51d351aa0c7dc79a5267b928..9ade74b36edb01186e15081dffc713e769160e55 100644 (file)
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -1304,7 +1304,7 @@ static irqreturn_t rmi_f11_attention(int irq, void *ctx)
        struct f11_data *f11 = dev_get_drvdata(&fn->dev);
        u16 data_base_addr = fn->fd.data_base_addr;
        int error;
-       int valid_bytes = f11->sensor.pkt_size;
+       u32 valid_bytes = f11->sensor.pkt_size;
 
        if (drvdata->attn_data.data) {
                /*

diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c
index 973288103b6ae251e175f183115c6ccb341eb556..b179980003f147a2568a67589c6877100b7edb69 100644 (file)
--- a/drivers/input/rmi4/rmi_f12.c
+++ b/drivers/input/rmi4/rmi_f12.c
@@ -5,6 +5,7 @@
 #include <linux/input.h>
 #include <linux/input/mt.h>
 #include <linux/rmi.h>
+#include <linux/sizes.h>
 #include "rmi_driver.h"
 #include "rmi_2d_sensor.h"
 
@@ -118,7 +119,7 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12)
 
        if (item->reg_size > sizeof(buf)) {
                dev_err(&fn->dev,
-                       "F12 control8 should be no bigger than %zd bytes, not: %ld\n",
+                       "F12 control8 should be no bigger than %zd bytes, not: %u\n",
                        sizeof(buf), item->reg_size);
                return -ENODEV;
        }
@@ -256,7 +257,7 @@ static irqreturn_t rmi_f12_attention(int irq, void *ctx)
        struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
        struct f12_data *f12 = dev_get_drvdata(&fn->dev);
        struct rmi_2d_sensor *sensor = &f12->sensor;
-       int valid_bytes = sensor->pkt_size;
+       u32 valid_bytes = sensor->pkt_size;
 
        if (drvdata->attn_data.data) {
                if (sensor->attn_size > drvdata->attn_data.size)
@@ -310,7 +311,7 @@ static int rmi_f12_write_control_regs(struct rmi_function *fn)
                         * on the existence of subpacket 0. If control 20 is
                         * larger then 3 bytes, just read the first 3.
                         */
-                       control_size = min(item->reg_size, 3UL);
+                       control_size = min(item->reg_size, 3U);
 
                        ret = rmi_read_block(rmi_dev, fn->fd.control_base_addr
                                        + control_offset, buf, control_size);
@@ -379,7 +380,8 @@ static int rmi_f12_probe(struct rmi_function *fn)
        struct rmi_2d_sensor *sensor;
        struct rmi_device_platform_data *pdata = rmi_get_platform_data(rmi_dev);
        struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
-       u16 data_offset = 0;
+       size_t data_offset = 0;
+       size_t pkt_size;
        int mask_size;
        int i;
 
@@ -431,7 +433,12 @@ static int rmi_f12_probe(struct rmi_function *fn)
        sensor = &f12->sensor;
        sensor->fn = fn;
        f12->data_addr = fn->fd.data_base_addr;
-       sensor->pkt_size = rmi_register_desc_calc_size(&f12->data_reg_desc);
+       pkt_size = rmi_register_desc_calc_size(&f12->data_reg_desc);
+       if (pkt_size > SZ_1M) {
+               dev_err(&fn->dev, "Invalid data packet size: %zu\n", pkt_size);
+               return -EINVAL;
+       }
+       sensor->pkt_size = pkt_size;
 
        sensor->axis_align =
                f12->sensor_pdata.axis_align;
@@ -444,7 +451,7 @@ static int rmi_f12_probe(struct rmi_function *fn)
                sensor->sensor_type =
                        f12->sensor_pdata.sensor_type;
 
-       rmi_dbg(RMI_DEBUG_FN, &fn->dev, "%s: data packet size: %d\n", __func__,
+       rmi_dbg(RMI_DEBUG_FN, &fn->dev, "%s: data packet size: %u\n", __func__,
                sensor->pkt_size);
        sensor->data_pkt = devm_kzalloc(&fn->dev, sensor->pkt_size, GFP_KERNEL);
        if (!sensor->data_pkt)
@@ -471,6 +478,12 @@ static int rmi_f12_probe(struct rmi_function *fn)
                if (drvdata->attn_data.data && i != 1 && i != 5)
                        continue;
 
+               if (data_offset > U16_MAX) {
+                       dev_err(&fn->dev, "Invalid offset for data%d: %zu\n",
+                               i, data_offset);
+                       return -EINVAL;
+               }
+
                switch (i) {
                case 1:
                        f12->data1 = item;