OSDN Git Service

camera_v2: fix strlcpy-strlcat-size warnings
authorVol Zhdanov <wight554@gmail.com>
Sat, 30 Jun 2018 01:28:27 +0000 (01:28 +0000)
committer0ranko0P <ranko0p@outlook.com>
Wed, 4 Dec 2019 17:17:33 +0000 (01:17 +0800)
Change-Id: I614817742966ce2161bd2a22ec174d023cada3cd

drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

index f629cae..6252fb2 100644 (file)
@@ -1827,11 +1827,11 @@ static int msm_eeprom_platform_probe(struct platform_device *pdev)
 
                for (j = 0; j < 3; j++) {
                        if (0 == j) {
-                               strlcat(module_eeprom_name, pro_name, sizeof(pro_name));
+                               strlcat(module_eeprom_name, pro_name, sizeof(module_eeprom_name));
                        } else if (1 == j) {
-                               strlcat(module_eeprom_name, sensor_name, sizeof(sensor_name));
+                               strlcat(module_eeprom_name, sensor_name, sizeof(module_eeprom_name));
                        } else {
-                               strlcat(module_eeprom_name, module_name, sizeof(module_name));
+                               strlcat(module_eeprom_name, module_name, sizeof(module_eeprom_name));
                        }
                }
                CDBG("%s: module_eeprom_name = %s\n", __func__, module_eeprom_name);
@@ -1894,7 +1894,7 @@ static int msm_eeprom_platform_probe(struct platform_device *pdev)
        e_ctrl->is_supported = (e_ctrl->is_supported << 1) | 1;
 
 #ifdef CONFIG_MACH_XIAOMI_MSM8998
-       strlcpy(sensor_eeprom_name[eeprom_name_count].name, module_eeprom_name, sizeof(module_eeprom_name));
+       strlcpy(sensor_eeprom_name[eeprom_name_count].name, module_eeprom_name, sizeof(sensor_eeprom_name[eeprom_name_count].name));
        pr_err("%s: sensor_eeprom_name[%d] = %s, probe success!\n", __func__, eeprom_name_count, sensor_eeprom_name[eeprom_name_count].name);
        eeprom_name_count++;
 #endif