Module Name: src
Committed By: christos
Date: Tue Mar 25 15:33:22 UTC 2014
Modified Files:
src/sys/external/bsd/drm/dist/libdrm: xf86drm.c xf86drmMode.c
src/sys/external/bsd/drm/dist/libdrm/nouveau: nouveau_dma.h
src/sys/external/bsd/drm/dist/tests: dristat.c drmstat.c
src/sys/external/bsd/drm2/dist/drm: drm_debugfs.c drm_pci.c
drm_platform.c drm_proc.c
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_arm.c
vchiq_proc.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/libdrm/xf86drm.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/drm/dist/tests/dristat.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/external/bsd/drm/dist/tests/drmstat.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c \
src/sys/external/bsd/drm2/dist/drm/drm_pci.c \
src/sys/external/bsd/drm2/dist/drm/drm_platform.c \
src/sys/external/bsd/drm2/dist/drm/drm_proc.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/libdrm/xf86drm.c
diff -u src/sys/external/bsd/drm/dist/libdrm/xf86drm.c:1.2 src/sys/external/bsd/drm/dist/libdrm/xf86drm.c:1.3
--- src/sys/external/bsd/drm/dist/libdrm/xf86drm.c:1.2 Fri Jun 19 21:07:10 2009
+++ src/sys/external/bsd/drm/dist/libdrm/xf86drm.c Tue Mar 25 11:33:22 2014
@@ -292,7 +292,8 @@ static int drmOpenDevice(long dev, int m
uid_t user = DRM_DEV_UID;
gid_t group = DRM_DEV_GID, serv_group;
- sprintf(buf, type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME, DRM_DIR_NAME, minor);
+ snprintf(buf, sizeof(buf), type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME,
+ DRM_DIR_NAME, minor);
drmMsg("drmOpenDevice: node name is %s\n", buf);
if (drm_server_info) {
@@ -399,7 +400,8 @@ static int drmOpenMinor(int minor, int c
if (create)
return drmOpenDevice(makedev(DRM_MAJOR, minor), minor, type);
- sprintf(buf, type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME, DRM_DIR_NAME, minor);
+ snprintf(buf, sizeof(buf), type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME,
+ DRM_DIR_NAME, minor);
if ((fd = open(buf, O_RDWR, 0)) >= 0)
return fd;
return -errno;
@@ -553,7 +555,7 @@ static int drmOpenByName(const char *nam
char *driver, *pt, *devstring;
int retcode;
- sprintf(proc_name, "/proc/dri/%d/name", i);
+ snprintf(proc_name, sizeof(proc_name), "/proc/dri/%d/name", i);
if ((fd = open(proc_name, 0, 0)) >= 0) {
retcode = read(fd, buf, sizeof(buf)-1);
close(fd);
Index: src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c
diff -u src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c:1.1.1.1 src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c:1.2
--- src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c:1.1.1.1 Thu Jun 18 23:22:23 2009
+++ src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c Tue Mar 25 11:33:22 2014
@@ -585,7 +585,8 @@ int drmCheckModesettingSupported(const c
if (ret != 4)
return -EINVAL;
- sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm",
+ snprintf(pci_dev_dir, sizeof(pci_dev_dir),
+ "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm",
domain, bus, dev, func);
sysdir = opendir(pci_dev_dir);
@@ -604,7 +605,8 @@ int drmCheckModesettingSupported(const c
return 0;
}
- sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/",
+ snprintf(pci_dev_dir, sizeof(pci_dev_dir),
+ "/sys/bus/pci/devices/%04x:%02x:%02x.%d/",
domain, bus, dev, func);
sysdir = opendir(pci_dev_dir);
Index: src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h
diff -u src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h:1.1.1.1 src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h:1.2
--- src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h:1.1.1.1 Thu Jun 18 23:22:24 2009
+++ src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h Tue Mar 25 11:33:22 2014
@@ -136,7 +136,7 @@ nouveau_dma_begin(struct nouveau_channel
dma->push_free, faulty);
return;
}
- sprintf(faulty,"%s:%d",file,line);
+ snprintf(faulty, sizeof(faulty), "%s:%d", file, line);
#endif
nouveau_dma_space(chan, (size + 1));
Index: src/sys/external/bsd/drm/dist/tests/dristat.c
diff -u src/sys/external/bsd/drm/dist/tests/dristat.c:1.1.1.2 src/sys/external/bsd/drm/dist/tests/dristat.c:1.2
--- src/sys/external/bsd/drm/dist/tests/dristat.c:1.1.1.2 Thu Jun 18 23:22:25 2009
+++ src/sys/external/bsd/drm/dist/tests/dristat.c Tue Mar 25 11:33:22 2014
@@ -130,7 +130,7 @@ static void getclients(int fd)
printf(" a pid uid magic ioctls prog\n");
for (i = 0; !drmGetClient(fd, i, &auth, &pid, &uid, &magic, &iocs); i++) {
- sprintf(buf, "/proc/%d/cmdline", pid);
+ snprintf(buf, sizeof(buf), "/proc/%d/cmdline", pid);
memset(cmd, 0, sizeof(cmd));
if ((procfd = open(buf, O_RDONLY, 0)) >= 0) {
read(procfd, cmd, sizeof(cmd)-1);
@@ -262,7 +262,7 @@ int main(int argc, char **argv)
}
for (i = 0; i < 16; i++) if (!minor || i == minor) {
- sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i);
+ snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, i);
fd = drmOpenMinor(i, 1, DRM_NODE_RENDER);
if (fd >= 0) {
printf("%s\n", buf);
Index: src/sys/external/bsd/drm/dist/tests/drmstat.c
diff -u src/sys/external/bsd/drm/dist/tests/drmstat.c:1.1.1.1 src/sys/external/bsd/drm/dist/tests/drmstat.c:1.2
--- src/sys/external/bsd/drm/dist/tests/drmstat.c:1.1.1.1 Sat Jul 19 01:30:51 2008
+++ src/sys/external/bsd/drm/dist/tests/drmstat.c Tue Mar 25 11:33:22 2014
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
info->list[i].high_mark);
}
printf("===== /proc/dri/0/mem =====\n");
- sprintf(buf, "cat /proc/dri/0/mem");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/mem");
system(buf);
#if 1
if (!(bufs = drmMapBufs(fd))) {
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
bufs->list[i].address);
}
printf("===== /proc/dri/0/vma =====\n");
- sprintf(buf, "cat /proc/dri/0/vma");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/vma");
system(buf);
#endif
break;
@@ -249,7 +249,7 @@ int main(int argc, char **argv)
}
printf("0x%08lx:0x%04lx added\n", offset, size);
printf("===== /proc/dri/0/mem =====\n");
- sprintf(buf, "cat /proc/dri/0/mem");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/mem");
system(buf);
break;
case 'r':
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
}
printf("0x%08lx:0x%04lx added\n", offset, size);
printf("===== /proc/dri/0/mem =====\n");
- sprintf(buf, "cat /proc/dri/0/mem");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/mem");
system(buf);
break;
case 's':
@@ -279,7 +279,7 @@ int main(int argc, char **argv)
return 1;
}
printf("0x%04lx byte shm added at 0x%08lx\n", size, handle);
- sprintf(buf, "cat /proc/dri/0/vm");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/vm");
system(buf);
break;
case 'P':
@@ -293,11 +293,11 @@ int main(int argc, char **argv)
printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
offset, size, address, getpid());
printf("===== /proc/dri/0/vma =====\n");
- sprintf(buf, "cat /proc/dri/0/vma");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/vma");
system(buf);
mprotect((void *)offset, size, PROT_READ);
printf("===== /proc/dri/0/vma =====\n");
- sprintf(buf, "cat /proc/dri/0/vma");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/vma");
system(buf);
break;
case 'w':
@@ -312,13 +312,13 @@ int main(int argc, char **argv)
printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
offset, size, address, getpid());
printf("===== /proc/%d/maps =====\n", getpid());
- sprintf(buf, "cat /proc/%d/maps", getpid());
+ snprintf(buf, sizeof(buf), "cat /proc/%d/maps", getpid());
system(buf);
printf("===== /proc/dri/0/mem =====\n");
- sprintf(buf, "cat /proc/dri/0/mem");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/mem");
system(buf);
printf("===== /proc/dri/0/vma =====\n");
- sprintf(buf, "cat /proc/dri/0/vma");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/vma");
system(buf);
printf("===== READING =====\n");
for (i = 0; i < 0x10; i++)
@@ -336,7 +336,7 @@ int main(int argc, char **argv)
printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
printf("\n");
printf("===== /proc/dri/0/vma =====\n");
- sprintf(buf, "cat /proc/dri/0/vma");
+ snprintf(buf, sizeof(buf), "cat /proc/dri/0/vma");
system(buf);
break;
case 'L':
Index: src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c:1.1.1.1 Mon Jul 22 22:13:08 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c Tue Mar 25 11:33:22 2014
@@ -150,7 +150,7 @@ int drm_debugfs_init(struct drm_minor *m
INIT_LIST_HEAD(&minor->debugfs_list);
mutex_init(&minor->debugfs_lock);
- sprintf(name, "%d", minor_id);
+ snprintf(name, sizeof(name), "%d", minor_id);
minor->debugfs_root = debugfs_create_dir(name, root);
if (!minor->debugfs_root) {
DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s\n", name);
Index: src/sys/external/bsd/drm2/dist/drm/drm_pci.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_pci.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/drm_pci.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/drm_pci.c:1.1.1.1 Mon Jul 22 22:13:09 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_pci.c Tue Mar 25 11:33:22 2014
@@ -177,16 +177,15 @@ int drm_pci_set_busid(struct drm_device
} else
master->unique_len = len;
- dev->devname =
- kmalloc(strlen(pdriver->name) +
- master->unique_len + 2, GFP_KERNEL);
+ size_t devlen = strlen(pdriver->name) + master->unique_len + 2;
+ dev->devname = kmalloc(dev->devlen, GFP_KERNEL);
if (dev->devname == NULL) {
ret = -ENOMEM;
goto err;
}
- sprintf(dev->devname, "%s@%s", pdriver->name,
+ snprintf(dev->devname, devlen, "%s@%s", pdriver->name,
master->unique);
return 0;
@@ -217,14 +216,14 @@ int drm_pci_set_unique(struct drm_device
master->unique[master->unique_len] = '\0';
bus_name = dev->driver->bus->get_name(dev);
- dev->devname = kmalloc(strlen(bus_name) +
- strlen(master->unique) + 2, GFP_KERNEL);
+ size_t devlen = strlen(bus_name) + strlen(master->unique) + 2;
+ dev->devname = kmalloc(devlen, GFP_KERNEL);
if (!dev->devname) {
ret = -ENOMEM;
goto err;
}
- sprintf(dev->devname, "%s@%s", bus_name,
+ snprintf(dev->devname, devlen, "%s@%s", bus_name,
master->unique);
/* Return error if the busid submitted doesn't match the device's actual
Index: src/sys/external/bsd/drm2/dist/drm/drm_platform.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_platform.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/drm_platform.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/drm_platform.c:1.1.1.1 Mon Jul 22 22:13:09 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_platform.c Tue Mar 25 11:33:22 2014
@@ -147,16 +147,15 @@ static int drm_platform_set_busid(struct
goto err;
}
- dev->devname =
- kmalloc(strlen(dev->platformdev->name) +
- master->unique_len + 2, GFP_KERNEL);
+ size_t devlen = strlen(dev->platformdev->name) + master->unique_len + 2;
+ dev->devname = kmalloc(devlen, GFP_KERNEL);
if (dev->devname == NULL) {
ret = -ENOMEM;
goto err;
}
- sprintf(dev->devname, "%s@%s", dev->platformdev->name,
+ snprintf(dev->devname, devlen, "%s@%s", dev->platformdev->name,
master->unique);
return 0;
err:
Index: src/sys/external/bsd/drm2/dist/drm/drm_proc.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_proc.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/drm_proc.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/drm_proc.c:1.1.1.1 Mon Jul 22 22:13:09 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_proc.c Tue Mar 25 11:33:22 2014
@@ -153,7 +153,7 @@ int drm_proc_init(struct drm_minor *mino
int ret;
INIT_LIST_HEAD(&minor->proc_nodes.list);
- sprintf(name, "%d", minor_id);
+ snprintf(name, sizeof(name), "%d", minor_id);
minor->proc_root = proc_mkdir(name, root);
if (!minor->proc_root) {
DRM_ERROR("Cannot create /proc/dri/%s\n", name);
@@ -212,7 +212,7 @@ int drm_proc_cleanup(struct drm_minor *m
drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor);
- sprintf(name, "%d", minor->index);
+ snprintf(name, sizeof(name), "%d", minor->index);
remove_proc_entry(name, root);
return 0;
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.9 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.10
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.9 Sun Mar 16 01:20:30 2014
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c Tue Mar 25 11:33:22 2014
@@ -2234,7 +2234,7 @@ vchiq_use_internal(VCHIQ_STATE_T *state,
vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
if (use_type == USE_TYPE_VCHIQ) {
- sprintf(entity, "VCHIQ: ");
+ snprintf(entity, sizeof(entity), "VCHIQ: ");
entity_uc = &arm_state->peer_use_count;
} else if (service) {
snprintf(entity, sizeof(entity), "%c%c%c%c:%8x",
@@ -2370,7 +2370,7 @@ vchiq_release_internal(VCHIQ_STATE_T *st
service->client_id);
entity_uc = &service->service_use_count;
} else {
- sprintf(entity, "PEER: ");
+ snprintf(entity, sizeof(entity), "PEER: ");
entity_uc = &arm_state->peer_use_count;
}
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_proc.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_proc.c:1.1 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_proc.c:1.2
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_proc.c:1.1 Fri Mar 8 07:32:31 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_proc.c Tue Mar 25 11:33:22 2014
@@ -94,7 +94,7 @@ static int log_cfg_read(char *buffer,
break;
}
- len += sprintf(buffer + len,
+ len += snprintf(buffer + len, count - len,
"%s\n",
log_value ? log_value : "(null)");
