From: Keir Fraser Date: Tue, 30 Jan 2007 16:14:16 +0000 (+0000) Subject: ia64, ppc: Remove uses of sprintf(). X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15368^2~16 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=46b860ba4b74a8f8858a5cd11e02aad0de2937d7;p=xen.git ia64, ppc: Remove uses of sprintf(). Signed-off-by: Christoph Egger --- diff --git a/xen/arch/ia64/linux-xen/perfmon.c b/xen/arch/ia64/linux-xen/perfmon.c index cc776c631a..6ee588e26c 100644 --- a/xen/arch/ia64/linux-xen/perfmon.c +++ b/xen/arch/ia64/linux-xen/perfmon.c @@ -2305,7 +2305,7 @@ pfm_alloc_fd(struct file **cfile) inode->i_uid = current->fsuid; inode->i_gid = current->fsgid; - sprintf(name, "[%lu]", inode->i_ino); + snprintf(name, sizeof(name), "[%lu]", inode->i_ino); this.name = name; this.len = strlen(name); this.hash = inode->i_ino; diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c index 438b331f5c..548419b966 100644 --- a/xen/arch/ia64/linux-xen/setup.c +++ b/xen/arch/ia64/linux-xen/setup.c @@ -550,7 +550,7 @@ show_cpuinfo (struct seq_file *m, void *v) switch (c->family) { case 0x07: memcpy(family, "Itanium", 8); break; case 0x1f: memcpy(family, "Itanium 2", 10); break; - default: sprintf(family, "%u", c->family); break; + default: snprintf(family, sizeof(family), "%u", c->family); break; } /* build the feature string: */ @@ -572,7 +572,7 @@ show_cpuinfo (struct seq_file *m, void *v) /* print unknown features as a hex value: */ if (sep) *cp++ = sep; - sprintf(cp, " 0x%lx", mask); + snprintf(cp, sizeof(features) - (cp - features), " 0x%lx", mask); } seq_printf(m, diff --git a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c index 3f1f5b7a3c..72a3b18f85 100644 --- a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c +++ b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c @@ -754,7 +754,7 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address) geoid = cnodeid_get_geoid(cnode); moduleid = geo_module(geoid); - sprintf(address, "module_%c%c%c%c%.2d", + snprintf(address, 15, "module_%c%c%c%c%.2d", '0'+RACK_GET_CLASS(MODULE_GET_RACK(moduleid)), '0'+RACK_GET_GROUP(MODULE_GET_RACK(moduleid)), '0'+RACK_GET_NUM(MODULE_GET_RACK(moduleid)), @@ -764,7 +764,7 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address) bricktype = MODULE_GET_BTYPE(moduleid); if ((bricktype == L1_BRICKTYPE_191010) || (bricktype == L1_BRICKTYPE_1932)) - sprintf(address, "%s^%d", address, geo_slot(geoid)); + snprintf(address, 15+8, "%s^%d", address, geo_slot(geoid)); } #endif diff --git a/xen/arch/ia64/linux-xen/unaligned.c b/xen/arch/ia64/linux-xen/unaligned.c index 2cf6e806dc..b56867a513 100644 --- a/xen/arch/ia64/linux-xen/unaligned.c +++ b/xen/arch/ia64/linux-xen/unaligned.c @@ -1792,7 +1792,7 @@ printk("ia64_handle_unaligned: called, not working yet\n"); char buf[200]; /* comm[] is at most 16 bytes... */ size_t len; - len = sprintf(buf, "%s(%d): unaligned access to 0x%016lx, " + len = snprintf(buf, sizeof(buf), "%s(%d): unaligned access to 0x%016lx, " "ip=0x%016lx\n\r", current->comm, current->pid, ifa, regs->cr_iip + ipsr->ri); /* diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 275d7a9dc4..e62b259c4b 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -1124,7 +1124,7 @@ int construct_dom0(struct domain *d, panic("can't allocate start info page"); si = page_to_virt(start_info_page); memset(si, 0, PAGE_SIZE); - sprintf(si->magic, "xen-%i.%i-ia64", + snprintf(si->magic, sizeof(si->magic), "xen-%i.%i-ia64", xen_major_version(), xen_minor_version()); si->nr_pages = max_pages; si->flags = SIF_INITDOMAIN|SIF_PRIVILEGED; diff --git a/xen/arch/ia64/xen/gdbstub.c b/xen/arch/ia64/xen/gdbstub.c index 3fc748233e..548ec6e51a 100644 --- a/xen/arch/ia64/xen/gdbstub.c +++ b/xen/arch/ia64/xen/gdbstub.c @@ -289,13 +289,13 @@ gdb_arch_read_reg(unsigned long regnum, struct cpu_user_regs *regs, } dbg_printk("Register read regnum = 0x%lx, val = 0x%lx\n", regnum, reg); - sprintf(buf, "%.08lx", swab64(reg)); + snprintf(buf, sizeof(buf), "%.08lx", swab64(reg)); out: return gdb_send_reply(buf, ctx); out_err: dbg_printk("Register read unsupported regnum = 0x%lx\n", regnum); - sprintf(buf, "%s", "x"); + safe_strcpy(buf, "x"); goto out; } #else @@ -756,19 +756,19 @@ gdb_arch_read_reg(unsigned long regnum, struct cpu_user_regs *regs, if (arg.error > 0) { // notify gdb that this register is not supported. // see fetch_register_using_p() in gdb/remote.c. - sprintf(buf, "%s", "x"); + safe_strcpy(buf, "x"); } else if (IA64_FR0_REGNUM <= regnum && regnum <= IA64_FR0_REGNUM + 127) { - sprintf(buf, "%.016lx", swab64(freg.u.bits[0])); - sprintf(buf + 16, "%.016lx", swab64(freg.u.bits[1])); + snprintf(buf, sizeof(buf), "%.016lx", swab64(freg.u.bits[0])); + snprintf(buf + 16, sizeof(buf) - 16, "%.016lx", swab64(freg.u.bits[1])); } else { - sprintf(buf, "%.016lx", swab64(reg)); + snprintf(buf, sizeof(buf), "%.016lx", swab64(reg)); } out: return gdb_send_reply(buf, ctx); out_err: dbg_printk("Register read unsupported regnum = 0x%lx\n", regnum); - sprintf(buf, "%s", "E0"); + safe_strcpy(buf, "E0"); goto out; } #endif diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c index 0d1eaf23dd..3692440240 100644 --- a/xen/arch/ia64/xen/xensetup.c +++ b/xen/arch/ia64/xen/xensetup.c @@ -551,10 +551,10 @@ void arch_get_xen_caps(xen_capabilities_info_t info) int major = xen_major_version(); int minor = xen_minor_version(); - p += sprintf(p,"xen-%d.%d-ia64 ", major, minor); + p += snprintf(p,sizeof(info), "xen-%d.%d-ia64 ", major, minor); if (vmx_enabled) - p += sprintf(p,"hvm-%d.%d-ia64 ", major, minor); + p += snprintf(p,sizeof(info) - (p - info),"hvm-%d.%d-ia64 ", major, minor); *(p-1) = 0; diff --git a/xen/arch/powerpc/domain_build.c b/xen/arch/powerpc/domain_build.c index 26dca89b83..080c1ab1b6 100644 --- a/xen/arch/powerpc/domain_build.c +++ b/xen/arch/powerpc/domain_build.c @@ -185,7 +185,7 @@ int construct_dom0(struct domain *d, si = (start_info_t *)(rma_addr(&d->arch, RMA_START_INFO) + rma); printk("xen_start_info: %p\n", si); - sprintf(si->magic, "xen-%i.%i-powerpc%d%s", + snprintf(si->magic, sizeof(si->magic), "xen-%i.%i-powerpc%d%s", xen_major_version(), xen_minor_version(), BITS_PER_LONG, "HV"); si->flags = SIF_PRIVILEGED | SIF_INITDOMAIN;