summaryrefslogtreecommitdiff
path: root/io-module
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2020-10-13 17:08:58 -0500
committerJohn Klug <john.klug@multitech.com>2020-10-14 14:16:38 -0500
commit9b727313435b84868f5f16c5e8a3aaf955ba13c8 (patch)
treebde3c773035ecab5e66648d048fb0816b2b5e08f /io-module
parentf7258a220f4aecae4b40ce2efb84ba28a2c7308f (diff)
downloadmts-io-9b727313435b84868f5f16c5e8a3aaf955ba13c8.tar.gz
mts-io-9b727313435b84868f5f16c5e8a3aaf955ba13c8.tar.bz2
mts-io-9b727313435b84868f5f16c5e8a3aaf955ba13c8.zip
No radio fix for array over-run4.4.1
Diffstat (limited to 'io-module')
-rw-r--r--io-module/mts-io.c8
-rw-r--r--io-module/mts_io_module.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index 204fd9f..0f4854b 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -823,7 +823,8 @@ mts_id_eeprom_load(void)
if (is_radio_power_attr_mtcdt(ap[j])) {
log_info("Pruning radio feature from mts-io",j);
ap[j] = NULL;
- current_blength = attr_blength = j * sizeof (ap[j]);
+ current_blength = j * sizeof (ap[j]); /* Size without NULL */
+ attr_blength += sizeof (ap[j]); /* Size of attr array with NULL */
break;
}
}
@@ -835,7 +836,7 @@ mts_id_eeprom_load(void)
if(DEVICE_CAPA(id_eeprom.capa, CAPA_GPS)) {
attr_blength += sizeof mtcdt_0_1_gnss_attributes;
}
- if (current_blength+(sizeof(struct attribute *)) != attr_blength) {
+ if (current_blength+(sizeof(struct attribute *)) != attr_blength) {
freelater = all_attrs = kmalloc(attr_blength,GFP_KERNEL);
current_count = current_blength/(sizeof (struct attribute *));
memcpy(all_attrs,mtcdt_0_1_platform_attributes,current_blength);
@@ -874,7 +875,8 @@ mts_id_eeprom_load(void)
if (is_radio_power_attr_mtcdt(ap[j])) {
log_info("Pruning radio feature from mts-io",j);
ap[j] = NULL;
- current_blength = attr_blength = j * sizeof (ap[j]);
+ current_blength = j * sizeof (ap[j]); /* Size without NULL */
+ attr_blength += sizeof (ap[j]); /* Size of attr array with NULL */
break;
}
}
diff --git a/io-module/mts_io_module.h b/io-module/mts_io_module.h
index cdaeaeb..14a5592 100644
--- a/io-module/mts_io_module.h
+++ b/io-module/mts_io_module.h
@@ -5,7 +5,7 @@
* MTAC cards.
*/
-#define DRIVER_VERSION "v4.4.0"
+#define DRIVER_VERSION "v4.4.1"
#define DRIVER_AUTHOR "Multitech Systems"
#define DRIVER_DESC "MTS-IO Controller"
#define DRIVER_NAME "mts-io"