Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86234?usp=email )
Change subject: tree: Use memcpy_s instead of memcpy ......................................................................
tree: Use memcpy_s instead of memcpy
Change-Id: I35e7504e169f93a64579379827cdca5cd8abae47 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M src/drivers/efi/info.c M src/drivers/i2c/at24rf08c/lenovo_serials.c M src/drivers/ipmi/ipmi_kcs_ops.c M src/mainboard/51nb/x210/romstage.c M src/mainboard/clevo/kbl-u/variants/n13xwu/romstage.c M src/mainboard/facebook/monolith/spd/spd_util.c M src/mainboard/getac/p470/acpi_tables.c M src/mainboard/google/eve/romstage.c M src/mainboard/google/fizz/romstage.c M src/mainboard/intel/apollolake_rvp/romstage.c M src/mainboard/intel/kblrvp/spd/spd_util.c M src/mainboard/intel/kunimitsu/spd/spd_util.c M src/mainboard/intel/saddlebrook/spd/spd_util.c M src/mainboard/lenovo/thinkcentre_m710s/romstage.c M src/mainboard/libretrend/lt1000/romstage.c M src/mainboard/ocp/tiogapass/romstage.c M src/mainboard/protectli/vault_kbl/romstage.c M src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c M src/mainboard/starlabs/starbook/variants/kbl/romstage.c M src/mainboard/system76/kbl-u/romstage.c M src/northbridge/intel/x4x/dq_dqs.c 21 files changed, 67 insertions(+), 67 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/86234/1
diff --git a/src/drivers/efi/info.c b/src/drivers/efi/info.c index fc1cfea..d44ac07 100644 --- a/src/drivers/efi/info.c +++ b/src/drivers/efi/info.c @@ -21,7 +21,7 @@ fw_info->tag = LB_TAG_EFI_FW_INFO; fw_info->size = sizeof(*fw_info);
- memcpy(fw_info->guid, guid, sizeof(guid)); + memcpy_s(fw_info->guid, sizeof(fw_info->guid), guid, sizeof(guid)); fw_info->version = CONFIG_DRIVERS_EFI_MAIN_FW_VERSION; fw_info->lowest_supported_version = CONFIG_DRIVERS_EFI_MAIN_FW_LSV; fw_info->fw_size = CONFIG_ROM_SIZE; diff --git a/src/drivers/i2c/at24rf08c/lenovo_serials.c b/src/drivers/i2c/at24rf08c/lenovo_serials.c index dd09dda..4a7c166 100644 --- a/src/drivers/i2c/at24rf08c/lenovo_serials.c +++ b/src/drivers/i2c/at24rf08c/lenovo_serials.c @@ -46,7 +46,7 @@ int t = at24rf08c_read_byte(dev, start + i);
if (t < 0x20 || t > 0x7f) { - memcpy(result, ERROR_STRING, sizeof(ERROR_STRING)); + memcpy_s(result, sizeof(result), ERROR_STRING, sizeof(ERROR_STRING)); return; } result[i] = t; @@ -61,7 +61,7 @@ dev = at24rf08c_find_bank(bank); if (dev == NULL) { printk(BIOS_WARNING, "EEPROM not found\n"); - memcpy(result, ERROR_STRING, sizeof(ERROR_STRING)); + memcpy_s(result, sizeof(result), ERROR_STRING, sizeof(ERROR_STRING)); return; }
@@ -166,13 +166,13 @@
dev = at24rf08c_find_bank(2); if (dev == NULL) { - memcpy(result, ERROR_STRING, sizeof(ERROR_STRING)); + memcpy_s(result, sizeof(result), ERROR_STRING, sizeof(ERROR_STRING)); return result; }
len = at24rf08c_read_byte(dev, 0x26) - 2; if (len < 0 || len > sizeof(result) - 1) { - memcpy(result, ERROR_STRING, sizeof(ERROR_STRING)); + memcpy_s(result, sizeof(result), ERROR_STRING, sizeof(ERROR_STRING)); return result; }
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c index 69db489..3bde50a 100644 --- a/src/drivers/ipmi/ipmi_kcs_ops.c +++ b/src/drivers/ipmi/ipmi_kcs_ops.c @@ -134,9 +134,9 @@ bmc_revision_major = rsp.fw_rev1; bmc_revision_minor = rsp.fw_rev2;
- memcpy(&man_id, rsp.manufacturer_id, sizeof(rsp.manufacturer_id)); + memcpy_s(&man_id, sizeof(&man_id), rsp.manufacturer_id, sizeof(rsp.manufacturer_id));
- memcpy(&prod_id, rsp.product_id, sizeof(rsp.product_id)); + memcpy_s(&prod_id, sizeof(&prod_id), rsp.product_id, sizeof(rsp.product_id));
printk(BIOS_INFO, "IPMI: Found man_id 0x%06x, prod_id 0x%04x\n", man_id, prod_id);
diff --git a/src/mainboard/51nb/x210/romstage.c b/src/mainboard/51nb/x210/romstage.c index 4a776ad..6cfaa50 100644 --- a/src/mainboard/51nb/x210/romstage.c +++ b/src/mainboard/51nb/x210/romstage.c @@ -9,14 +9,14 @@ { /* Rcomp resistor */ const u16 RcompResistor[3] = { 121, 81, 100 }; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 }; - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); }
void mainboard_memory_init_params(FSPM_UPD *mupd) diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/romstage.c b/src/mainboard/clevo/kbl-u/variants/n13xwu/romstage.c index 116d418..c837dc4 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/romstage.c +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/romstage.c @@ -8,13 +8,13 @@ static void mainboard_fill_rcomp_res_data(void *rcomp_ptr) { const u16 RcompResistor[3] = {121, 81, 100}; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { const u16 RcompTarget[5] = {100, 40, 20, 20, 26}; - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); }
void variant_configure_fspm(FSPM_UPD *mupd) diff --git a/src/mainboard/facebook/monolith/spd/spd_util.c b/src/mainboard/facebook/monolith/spd/spd_util.c index 07cf286e..135adf1 100644 --- a/src/mainboard/facebook/monolith/spd/spd_util.c +++ b/src/mainboard/facebook/monolith/spd/spd_util.c @@ -13,7 +13,7 @@ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; - memcpy(dq_map_ptr, dq_map, sizeof(dq_map)); + memcpy_s(dq_map_ptr, sizeof(dq_map_ptr), dq_map, sizeof(dq_map)); }
void mainboard_fill_dqs_map_data(void *dqs_map_ptr) @@ -22,7 +22,7 @@ const u8 dqs_map[2][8] = { { 0, 1, 3, 2, 4, 5, 6, 7 }, { 1, 0, 4, 5, 2, 3, 6, 7 } }; - memcpy(dqs_map_ptr, dqs_map, sizeof(dqs_map)); + memcpy_s(dqs_map_ptr, sizeof(dqs_map_ptr), dqs_map, sizeof(dqs_map)); }
void mainboard_fill_rcomp_res_data(void *rcomp_ptr) @@ -38,5 +38,5 @@ /* Rcomp target */ static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c index 1429b59..766dab5f 100644 --- a/src/mainboard/getac/p470/acpi_tables.c +++ b/src/mainboard/getac/p470/acpi_tables.c @@ -45,7 +45,7 @@
ecdt->gpe_bit = 23; // SCI interrupt within GPEx_STS
- memcpy(ecdt->ec_id, ec_id, sizeof(ec_id)); + memcpy_s(ecdt->ec_id, sizeof(ecdt->ec_id), ec_id, sizeof(ec_id));
header->checksum = acpi_checksum((void *)ecdt, ecdt_len); diff --git a/src/mainboard/google/eve/romstage.c b/src/mainboard/google/eve/romstage.c index 31a9461..0233c95 100644 --- a/src/mainboard/google/eve/romstage.c +++ b/src/mainboard/google/eve/romstage.c @@ -29,12 +29,12 @@ /* Rcomp target */ const u16 rcomp_target[] = { 100, 40, 40, 23, 40 };
- memcpy(&mem_cfg->DqByteMapCh0, dq_map[0], sizeof(dq_map[0])); - memcpy(&mem_cfg->DqByteMapCh1, dq_map[1], sizeof(dq_map[1])); - memcpy(&mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(dqs_map[0])); - memcpy(&mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(dqs_map[1])); - memcpy(&mem_cfg->RcompResistor, rcomp_resistor, sizeof(rcomp_resistor)); - memcpy(&mem_cfg->RcompTarget, rcomp_target, sizeof(rcomp_target)); + memcpy_s(&mem_cfg->DqByteMapCh0, sizeof(&mem_cfg->DqByteMapCh0), dq_map[0], sizeof(dq_map[0])); + memcpy_s(&mem_cfg->DqByteMapCh1, sizeof(&mem_cfg->DqByteMapCh1), dq_map[1], sizeof(dq_map[1])); + memcpy_s(&mem_cfg->DqsMapCpu2DramCh0, sizeof(&mem_cfg->DqsMapCpu2DramCh0), dqs_map[0], sizeof(dqs_map[0])); + memcpy_s(&mem_cfg->DqsMapCpu2DramCh1, sizeof(&mem_cfg->DqsMapCpu2DramCh1), dqs_map[1], sizeof(dqs_map[1])); + memcpy_s(&mem_cfg->RcompResistor, sizeof(&mem_cfg->RcompResistor), rcomp_resistor, sizeof(rcomp_resistor)); + memcpy_s(&mem_cfg->RcompTarget, sizeof(&mem_cfg->RcompTarget), rcomp_target, sizeof(rcomp_target));
mem_cfg->MemorySpdPtr00 = mainboard_get_spd_data(); mem_cfg->MemorySpdPtr10 = mem_cfg->MemorySpdPtr00; diff --git a/src/mainboard/google/fizz/romstage.c b/src/mainboard/google/fizz/romstage.c index 5df33da..7a78a14 100644 --- a/src/mainboard/google/fizz/romstage.c +++ b/src/mainboard/google/fizz/romstage.c @@ -19,8 +19,8 @@ if (arch_upd->BootMode == FSP_BOOT_ON_S3_RESUME) return;
- memcpy(&mem_cfg->RcompResistor, rcomp_resistor, sizeof(rcomp_resistor)); - memcpy(&mem_cfg->RcompTarget, rcomp_target, sizeof(rcomp_target)); + memcpy_s(&mem_cfg->RcompResistor, sizeof(&mem_cfg->RcompResistor), rcomp_resistor, sizeof(rcomp_resistor)); + memcpy_s(&mem_cfg->RcompTarget, sizeof(&mem_cfg->RcompTarget), rcomp_target, sizeof(rcomp_target));
/* Read spd block to get memory config */ struct spd_block blk = { diff --git a/src/mainboard/intel/apollolake_rvp/romstage.c b/src/mainboard/intel/apollolake_rvp/romstage.c index 01d0759..47fad2c 100644 --- a/src/mainboard/intel/apollolake_rvp/romstage.c +++ b/src/mainboard/intel/apollolake_rvp/romstage.c @@ -51,10 +51,10 @@ mupd->FspmConfig.Ch3_DeviceWidth = 0; mupd->FspmConfig.Ch3_DramDensity = 0; mupd->FspmConfig.Ch3_Option = 3; - memcpy(mupd->FspmConfig.Ch0_Bit_swizzling, swizzling_rvp1, sizeof(swizzling_rvp1)); - memcpy(mupd->FspmConfig.Ch1_Bit_swizzling, swizzling_rvp1, sizeof(swizzling_rvp1)); - memcpy(mupd->FspmConfig.Ch2_Bit_swizzling, swizzling_rvp1, sizeof(swizzling_rvp1)); - memcpy(mupd->FspmConfig.Ch3_Bit_swizzling, swizzling_rvp1, sizeof(swizzling_rvp1)); + memcpy_s(mupd->FspmConfig.Ch0_Bit_swizzling, sizeof(mupd->FspmConfig.Ch0_Bit_swizzling), swizzling_rvp1, sizeof(swizzling_rvp1)); + memcpy_s(mupd->FspmConfig.Ch1_Bit_swizzling, sizeof(mupd->FspmConfig.Ch1_Bit_swizzling), swizzling_rvp1, sizeof(swizzling_rvp1)); + memcpy_s(mupd->FspmConfig.Ch2_Bit_swizzling, sizeof(mupd->FspmConfig.Ch2_Bit_swizzling), swizzling_rvp1, sizeof(swizzling_rvp1)); + memcpy_s(mupd->FspmConfig.Ch3_Bit_swizzling, sizeof(mupd->FspmConfig.Ch3_Bit_swizzling), swizzling_rvp1, sizeof(swizzling_rvp1)); }
static void rvp2_fill_memory_params(FSPM_UPD *mupd) diff --git a/src/mainboard/intel/kblrvp/spd/spd_util.c b/src/mainboard/intel/kblrvp/spd/spd_util.c index 65b98d1..baefd78 100644 --- a/src/mainboard/intel/kblrvp/spd/spd_util.c +++ b/src/mainboard/intel/kblrvp/spd/spd_util.c @@ -14,8 +14,8 @@ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; - memcpy(dq_map_ch0, dq_map[0], sizeof(dq_map[0])); - memcpy(dq_map_ch1, dq_map[1], sizeof(dq_map[1])); + memcpy_s(dq_map_ch0, sizeof(dq_map_ch0), dq_map[0], sizeof(dq_map[0])); + memcpy_s(dq_map_ch1, sizeof(dq_map_ch1), dq_map[1], sizeof(dq_map[1])); }
void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1) @@ -24,8 +24,8 @@ const u8 dqs_map[2][8] = { { 0, 1, 3, 2, 4, 5, 6, 7 }, { 1, 0, 4, 5, 2, 3, 6, 7 } }; - memcpy(dqs_map_ch0, dqs_map[0], sizeof(dqs_map[0])); - memcpy(dqs_map_ch1, dqs_map[1], sizeof(dqs_map[1])); + memcpy_s(dqs_map_ch0, sizeof(dqs_map_ch0), dqs_map[0], sizeof(dqs_map[0])); + memcpy_s(dqs_map_ch1, sizeof(dqs_map_ch1), dqs_map[1], sizeof(dqs_map[1])); }
void mainboard_fill_rcomp_res_data(void *rcomp_ptr) @@ -41,5 +41,5 @@ /* Rcomp target */ static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/intel/kunimitsu/spd/spd_util.c b/src/mainboard/intel/kunimitsu/spd/spd_util.c index e79759c..5cd2ada 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd_util.c +++ b/src/mainboard/intel/kunimitsu/spd/spd_util.c @@ -17,8 +17,8 @@ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; - memcpy(dq_map_ch0, dq_map[0], sizeof(dq_map[0])); - memcpy(dq_map_ch1, dq_map[1], sizeof(dq_map[1])); + memcpy_s(dq_map_ch0, sizeof(dq_map_ch0), dq_map[0], sizeof(dq_map[0])); + memcpy_s(dq_map_ch1, sizeof(dq_map_ch1), dq_map[1], sizeof(dq_map[1])); }
void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1) @@ -27,8 +27,8 @@ const u8 dqs_map[2][8] = { { 0, 1, 3, 2, 6, 5, 4, 7 }, { 2, 3, 0, 1, 6, 7, 4, 5 } }; - memcpy(dqs_map_ch0, dqs_map[0], sizeof(dqs_map[0])); - memcpy(dqs_map_ch1, dqs_map[1], sizeof(dqs_map[1])); + memcpy_s(dqs_map_ch0, sizeof(dqs_map_ch0), dqs_map[0], sizeof(dqs_map[0])); + memcpy_s(dqs_map_ch1, sizeof(dqs_map_ch1), dqs_map[1], sizeof(dqs_map[1])); }
void mainboard_fill_rcomp_res_data(void *rcomp_ptr) @@ -56,7 +56,7 @@ memcpy(rcomp_strength_ptr, StrengthendRcompTarget, sizeof(StrengthendRcompTarget)); } else { - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); } }
diff --git a/src/mainboard/intel/saddlebrook/spd/spd_util.c b/src/mainboard/intel/saddlebrook/spd/spd_util.c index bd2d438..795c490 100644 --- a/src/mainboard/intel/saddlebrook/spd/spd_util.c +++ b/src/mainboard/intel/saddlebrook/spd/spd_util.c @@ -12,8 +12,8 @@ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; - memcpy(dq_map_ch0, dq_map[0], sizeof(dq_map[0])); - memcpy(dq_map_ch1, dq_map[1], sizeof(dq_map[1])); + memcpy_s(dq_map_ch0, sizeof(dq_map_ch0), dq_map[0], sizeof(dq_map[0])); + memcpy_s(dq_map_ch1, sizeof(dq_map_ch1), dq_map[1], sizeof(dq_map[1])); }
void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1) @@ -22,20 +22,20 @@ const u8 dqs_map[2][8] = { { 0, 1, 3, 2, 4, 5, 6, 7 }, { 1, 0, 4, 5, 2, 3, 6, 7 } }; - memcpy(dqs_map_ch0, dqs_map[0], sizeof(dqs_map[0])); - memcpy(dqs_map_ch1, dqs_map[1], sizeof(dqs_map[1])); + memcpy_s(dqs_map_ch0, sizeof(dqs_map_ch0), dqs_map[0], sizeof(dqs_map[0])); + memcpy_s(dqs_map_ch1, sizeof(dqs_map_ch1), dqs_map[1], sizeof(dqs_map[1])); }
void mainboard_fill_rcomp_res_data(void *rcomp_ptr) { /* Rcomp resistor */ const u16 RcompResistor[3] = { 121, 81, 100 }; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ static const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 }; - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/lenovo/thinkcentre_m710s/romstage.c b/src/mainboard/lenovo/thinkcentre_m710s/romstage.c index 23f4cf4..c9a6711 100644 --- a/src/mainboard/lenovo/thinkcentre_m710s/romstage.c +++ b/src/mainboard/lenovo/thinkcentre_m710s/romstage.c @@ -29,10 +29,10 @@ const u16 rcomp_resistors[] = {121, 75, 100};
assert(sizeof(mem_cfg->RcompResistor) == sizeof(rcomp_resistors)); - memcpy(mem_cfg->RcompResistor, rcomp_resistors, sizeof(rcomp_resistors)); + memcpy_s(mem_cfg->RcompResistor, sizeof(mem_cfg->RcompResistor), rcomp_resistors, sizeof(rcomp_resistors));
const u16 rcomp_targets[] = {60, 26, 20, 20, 26};
assert(sizeof(mem_cfg->RcompTarget) == sizeof(rcomp_targets)); - memcpy(mem_cfg->RcompTarget, rcomp_targets, sizeof(rcomp_targets)); + memcpy_s(mem_cfg->RcompTarget, sizeof(mem_cfg->RcompTarget), rcomp_targets, sizeof(rcomp_targets)); } diff --git a/src/mainboard/libretrend/lt1000/romstage.c b/src/mainboard/libretrend/lt1000/romstage.c index a0212a2..6175774 100644 --- a/src/mainboard/libretrend/lt1000/romstage.c +++ b/src/mainboard/libretrend/lt1000/romstage.c @@ -11,8 +11,8 @@ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; - memcpy(dq_map_ch0, dq_map[0], sizeof(dq_map[0])); - memcpy(dq_map_ch1, dq_map[1], sizeof(dq_map[1])); + memcpy_s(dq_map_ch0, sizeof(dq_map_ch0), dq_map[0], sizeof(dq_map[0])); + memcpy_s(dq_map_ch1, sizeof(dq_map_ch1), dq_map[1], sizeof(dq_map[1])); }
static void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1) @@ -20,20 +20,20 @@ const u8 dqs_map[2][8] = { { 0, 1, 2, 3, 4, 5, 6, 7 }, { 1, 0, 2, 3, 4, 5, 6, 7 } }; - memcpy(dqs_map_ch0, dqs_map[0], sizeof(dqs_map[0])); - memcpy(dqs_map_ch1, dqs_map[1], sizeof(dqs_map[1])); + memcpy_s(dqs_map_ch0, sizeof(dqs_map_ch0), dqs_map[0], sizeof(dqs_map[0])); + memcpy_s(dqs_map_ch1, sizeof(dqs_map_ch1), dqs_map[1], sizeof(dqs_map[1])); }
static void mainboard_fill_rcomp_res_data(void *rcomp_ptr) { const u16 RcompResistor[3] = { 121, 81, 100 }; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 }; - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); }
void mainboard_memory_init_params(FSPM_UPD *mupd) diff --git a/src/mainboard/ocp/tiogapass/romstage.c b/src/mainboard/ocp/tiogapass/romstage.c index ca54aba..316fea2 100644 --- a/src/mainboard/ocp/tiogapass/romstage.c +++ b/src/mainboard/ocp/tiogapass/romstage.c @@ -36,7 +36,7 @@
static void mainboard_config_iio(FSPM_UPD *mupd) { - memcpy(iio_table_buf, tp_iio_bifur_table, sizeof(tp_iio_bifur_table)); + memcpy_s(iio_table_buf, sizeof(iio_table_buf), tp_iio_bifur_table, sizeof(tp_iio_bifur_table)); mupd->FspmConfig.IioBifurcationConfig.IIoBifurcationTablePtr = (uintptr_t)(UPD_IIO_BIFURCATION_DATA_ENTRY *)iio_table_buf; mupd->FspmConfig.IioBifurcationConfig.NumberOfEntries = diff --git a/src/mainboard/protectli/vault_kbl/romstage.c b/src/mainboard/protectli/vault_kbl/romstage.c index 2b68e1a..21fd36d 100644 --- a/src/mainboard/protectli/vault_kbl/romstage.c +++ b/src/mainboard/protectli/vault_kbl/romstage.c @@ -12,8 +12,8 @@ 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; - memcpy(dq_map_ch0, dq_map[0], sizeof(dq_map[0])); - memcpy(dq_map_ch1, dq_map[1], sizeof(dq_map[1])); + memcpy_s(dq_map_ch0, sizeof(dq_map_ch0), dq_map[0], sizeof(dq_map[0])); + memcpy_s(dq_map_ch1, sizeof(dq_map_ch1), dq_map[1], sizeof(dq_map[1])); }
static void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1) @@ -21,20 +21,20 @@ const u8 dqs_map[2][8] = { { 0, 1, 2, 3, 4, 5, 6, 7 }, { 1, 0, 2, 3, 4, 5, 6, 7 } }; - memcpy(dqs_map_ch0, dqs_map[0], sizeof(dqs_map[0])); - memcpy(dqs_map_ch1, dqs_map[1], sizeof(dqs_map[1])); + memcpy_s(dqs_map_ch0, sizeof(dqs_map_ch0), dqs_map[0], sizeof(dqs_map[0])); + memcpy_s(dqs_map_ch1, sizeof(dqs_map_ch1), dqs_map[1], sizeof(dqs_map[1])); }
static void mainboard_fill_rcomp_res_data(void *rcomp_ptr) { const u16 RcompResistor[3] = { 121, 81, 100 }; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { static const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 }; - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); }
void mainboard_memory_init_params(FSPM_UPD *mupd) diff --git a/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c b/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c index 0f6225c..597fabe 100644 --- a/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c +++ b/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c @@ -11,21 +11,21 @@ const u8 dq_map[2][12] = { {0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0, 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00}, {0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00}}; - memcpy(dq_map_ptr, dq_map, sizeof(dq_map)); + memcpy_s(dq_map_ptr, sizeof(dq_map_ptr), dq_map, sizeof(dq_map)); }
void mainboard_fill_dqs_map_data(void *dqs_map_ptr) { /* DQS CPU<>DRAM map */ const u8 dqs_map[2][8] = {{0, 1, 3, 2, 4, 5, 6, 7}, {1, 0, 4, 5, 2, 3, 6, 7}}; - memcpy(dqs_map_ptr, dqs_map, sizeof(dqs_map)); + memcpy_s(dqs_map_ptr, sizeof(dqs_map_ptr), dqs_map, sizeof(dqs_map)); }
void mainboard_fill_rcomp_res_data(void *rcomp_ptr) { /* Rcomp resistor */ const u16 RcompResistor[3] = {200, 81, 162}; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) @@ -33,5 +33,5 @@ /* Rcomp target */ static const u16 RcompTarget[5] = {100, 40, 40, 23, 40};
- memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/starlabs/starbook/variants/kbl/romstage.c b/src/mainboard/starlabs/starbook/variants/kbl/romstage.c index 30d7c14..64ee7dd 100644 --- a/src/mainboard/starlabs/starbook/variants/kbl/romstage.c +++ b/src/mainboard/starlabs/starbook/variants/kbl/romstage.c @@ -11,8 +11,8 @@ const u16 rcomp_resistor[] = {121, 81, 100}; const u16 rcomp_target[] = {100, 40, 20, 20, 26};
- memcpy(&mem_cfg->RcompResistor, rcomp_resistor, sizeof(rcomp_resistor)); - memcpy(&mem_cfg->RcompTarget, rcomp_target, sizeof(rcomp_target)); + memcpy_s(&mem_cfg->RcompResistor, sizeof(&mem_cfg->RcompResistor), rcomp_resistor, sizeof(rcomp_resistor)); + memcpy_s(&mem_cfg->RcompTarget, sizeof(&mem_cfg->RcompTarget), rcomp_target, sizeof(rcomp_target));
mem_cfg->MemorySpdPtr00 = spd_cbfs_map(6); mem_cfg->MemorySpdPtr10 = mem_cfg->MemorySpdPtr00; diff --git a/src/mainboard/system76/kbl-u/romstage.c b/src/mainboard/system76/kbl-u/romstage.c index c55978e..5ff6ec3 100644 --- a/src/mainboard/system76/kbl-u/romstage.c +++ b/src/mainboard/system76/kbl-u/romstage.c @@ -7,13 +7,13 @@ static void mainboard_fill_rcomp_res_data(void *rcomp_ptr) { const u16 RcompResistor[3] = {121, 81, 100}; - memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor)); + memcpy_s(rcomp_ptr, sizeof(rcomp_ptr), RcompResistor, sizeof(RcompResistor)); }
static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { const u16 RcompTarget[5] = {100, 40, 20, 20, 26}; - memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); + memcpy_s(rcomp_strength_ptr, sizeof(rcomp_strength_ptr), RcompTarget, sizeof(RcompTarget)); }
void mainboard_memory_init_params(FSPM_UPD *mupd) diff --git a/src/northbridge/intel/x4x/dq_dqs.c b/src/northbridge/intel/x4x/dq_dqs.c index 4355717..581728e 100644 --- a/src/northbridge/intel/x4x/dq_dqs.c +++ b/src/northbridge/intel/x4x/dq_dqs.c @@ -277,7 +277,7 @@ return CB_ERR; }
- memcpy(dq_upper, dq_lower, sizeof(dq_lower)); + memcpy_s(dq_upper, sizeof(dq_upper), dq_lower, sizeof(dq_lower));
if (find_dq_limit(s, channel, dq_setting, dq_upper, FAILING)) { printk(BIOS_WARNING, "Could not find failing upper limit DQ setting\n");