ia64: Clean up and fix errors in strncpy -> strlcpy conversion

Signed-off-by: Aron Griffis <aron@hp.com>

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index a6a58819500e0f2a7d4e8280b4f66b969bc6b119..0837966f804d68688c24ba0c2b7744ac4efb1dbb 100644 (file)
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -333,13 +333,13 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        memset(tables, 0, sizeof(struct fake_acpi_tables));
 
        /* setup XSDT (64bit version of RSDT) */
-       strlcpy(xsdt->signature, XSDT_SIG, sizeof(xsdt->signature));
+       memcpy(xsdt->signature, XSDT_SIG, sizeof(xsdt->signature));
        /* XSDT points to both the FADT and the MADT, so add one entry */
        xsdt->length = sizeof(struct xsdt_descriptor_rev2) + sizeof(u64);
        xsdt->revision = 1;
-       strlcpy(xsdt->oem_id, "XEN", sizeof(xsdt->oem_id));
-       strlcpy(xsdt->oem_table_id, "Xen/ia64", sizeof(xsdt->oem_table_id));
-       strlcpy(xsdt->asl_compiler_id, "XEN", sizeof(xsdt->asl_compiler_id));
+       safe_strcpy(xsdt->oem_id, "XEN");
+       safe_strcpy(xsdt->oem_table_id, "Xen/ia64");
+       safe_strcpy(xsdt->asl_compiler_id, "XEN");
        xsdt->asl_compiler_revision = (xen_major_version() << 16) |
                xen_minor_version();
 
@@ -349,16 +349,16 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        xsdt->checksum = generate_acpi_checksum(xsdt, xsdt->length);
 
        /* setup FADT */
-       strlcpy(fadt->signature, FADT_SIG, sizeof(fadt->signature));
+       memcpy(fadt->signature, FADT_SIG, sizeof(fadt->signature));
        fadt->length = sizeof(struct fadt_descriptor_rev2);
        fadt->revision = FADT2_REVISION_ID;
-       strlcpy(fadt->oem_id, "XEN", sizeof(fadt->oem_id));
-       strlcpy(fadt->oem_table_id, "Xen/ia64", sizeof(fadt->oem_table_id));
-       strlcpy(fadt->asl_compiler_id, "XEN", sizeof(fadt->asl_compiler_id));
+       safe_strcpy(fadt->oem_id, "XEN");
+       safe_strcpy(fadt->oem_table_id, "Xen/ia64");
+       safe_strcpy(fadt->asl_compiler_id, "XEN");
        fadt->asl_compiler_revision = (xen_major_version() << 16) |
                xen_minor_version();
 
-       strlcpy(facs->signature, FACS_SIG, sizeof(facs->signature));
+       memcpy(facs->signature, FACS_SIG, sizeof(facs->signature));
        facs->version = 1;
        facs->length = sizeof(struct facs_descriptor_rev2);
 
@@ -386,8 +386,8 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        fadt->checksum = generate_acpi_checksum(fadt, fadt->length);
 
        /* setup RSDP */
-       strlcpy(rsdp->signature, RSDP_SIG, sizeof(rsdp->signature));
-       strlcpy(rsdp->oem_id, "XEN", sizeof(rsdp->oem_id));
+       safe_strcpy(rsdp->signature, RSDP_SIG);
+       safe_strcpy(rsdp->oem_id, "XEN");
        rsdp->revision = 2; /* ACPI 2.0 includes XSDT */
        rsdp->length = sizeof(struct acpi20_table_rsdp);
        rsdp->xsdt_address = ACPI_TABLE_MPA(xsdt);
@@ -397,11 +397,11 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        rsdp->ext_checksum = generate_acpi_checksum(rsdp, rsdp->length);
 
        /* setup DSDT with trivial namespace. */ 
-       strlcpy(dsdt->signature, DSDT_SIG, sizeof(dsdt->signature));
+       safe_strcpy(dsdt->signature, DSDT_SIG);
        dsdt->revision = 1;
-       strlcpy(dsdt->oem_id, "XEN", sizeof(dsdt->oem_id));
-       strlcpy(dsdt->oem_table_id, "Xen/ia64", sizeof(dsdt->oem_table_id));
-       strlcpy(dsdt->asl_compiler_id, "XEN", sizeof(dsdt->asl_compiler_id));
+       safe_strcpy(dsdt->oem_id, "XEN");
+       safe_strcpy(dsdt->oem_table_id, "Xen/ia64");
+       safe_strcpy(dsdt->asl_compiler_id, "XEN");
        dsdt->asl_compiler_revision = (xen_major_version() << 16) |
                xen_minor_version();
 
@@ -409,7 +409,7 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        tables->aml[0] = 0x10; /* Scope */
        tables->aml[1] = 0x40; /* length/offset to next object (patched) */
        tables->aml[2] = 0x00;
-       strlcpy((char *)&tables->aml[3], "_SB_", 5);
+       memcpy(&tables->aml[3], "_SB_", 4);
 
        /* The processor object isn't absolutely necessary, revist for SMP */
        aml_len = 7;
@@ -437,14 +437,11 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        dsdt->checksum = generate_acpi_checksum(dsdt, dsdt->length);
 
        /* setup MADT */
-       strlcpy(madt->header.signature, APIC_SIG, sizeof(madt->header.signature));
+       memcpy(madt->header.signature, APIC_SIG, sizeof(madt->header.signature));
        madt->header.revision = 2;
-       strlcpy(madt->header.oem_id, "XEN",
-               sizeof(madt->header.oem_id));
-       strlcpy(madt->header.oem_table_id, "Xen/ia64",
-               sizeof(madt->header.oem_table_id));
-       strlcpy(madt->header.asl_compiler_id, "XEN",
-               sizeof(madt->header.asl_compiler_id));
+       safe_strcpy(madt->header.oem_id, "XEN");
+       safe_strcpy(madt->header.oem_table_id, "Xen/ia64");
+       safe_strcpy(madt->header.asl_compiler_id, "XEN");
        madt->header.asl_compiler_revision = (xen_major_version() << 16) |
                xen_minor_version();
 
@@ -763,10 +760,8 @@ dom_fw_init(struct domain *d,
        tables->sal_systab.sal_rev_major = 0;
        tables->sal_systab.entry_count = 2;
 
-       strlcpy((char *)tables->sal_systab.oem_id, "Xen/ia64",
-               sizeof(tables->sal_systab.oem_id));
-       strlcpy((char *)tables->sal_systab.product_id, "Xen/ia64",
-               sizeof(tables->sal_systab.product_id));
+       safe_strcpy((char *)tables->sal_systab.oem_id, "Xen/ia64");
+       safe_strcpy((char *)tables->sal_systab.product_id, "Xen/ia64");
 
        /* PAL entry point: */
        tables->sal_ed.type = SAL_DESC_ENTRY_POINT;

diff --git a/xen/arch/ia64/xen/oprofile/perfmon.c b/xen/arch/ia64/xen/oprofile/perfmon.c
index 612ac84a3e5c7dc68c887ab2eda9d3595540d34b..0488e1298bbf815bdb40b12ced78d6a7b8d460ec 100644 (file)
--- a/xen/arch/ia64/xen/oprofile/perfmon.c
+++ b/xen/arch/ia64/xen/oprofile/perfmon.c
@@ -120,7 +120,6 @@ xenoprof_arch_init(int *num_events, int *is_primary, char *cpu_type)
 {
     *num_events = 0;
     strlcpy(cpu_type, get_cpu_type(), XENOPROF_CPU_TYPE_SIZE);
-    cpu_type[XENOPROF_CPU_TYPE_SIZE - 1] = '\0';
 
     *is_primary = 0;
     if (xenoprof_primary_profiler == NULL) {