Add explicit snprintf overflow checks

With the new-fangled overflow checking in GCC 7.2, even the remote
possibility of a string overflow is reported as a warning, which then
gets elevated to an error due to -Werror.

This patch adds explicit checks to detect such overflows.

Signed-off-by: Cyril Chemparathy <[email protected]>

lib/system/linux/device.c

@@ -103,8 +103,11 @@ static int metal_uio_read_map_attr(struct linux_device *ldev, unsigned index,
 	const char *cls = ldev->cls_path;
 	struct sysfs_attribute *attr;
 	char path[SYSFS_PATH_MAX];
+	int result;
 
-	snprintf(path, sizeof(path), "%s/maps/map%u/%s", cls, index, name);
+	result = snprintf(path, sizeof(path), "%s/maps/map%u/%s", cls, index, name);
+	if (result >= (int)sizeof(path))
+		return -EOVERFLOW;
 	attr = sysfs_open_attribute(path);
 	if (!attr || sysfs_read_attribute(attr) != 0)
 		return -errno;
@@ -191,7 +194,9 @@ static int metal_uio_dev_open(struct linux_bus *lbus, struct linux_device *ldev)
 	if (result)
 		return result;
 
-	snprintf(path, sizeof(path), "%s/uio", ldev->sdev->path);
+	result = snprintf(path, sizeof(path), "%s/uio", ldev->sdev->path);
+	if (result >= (int)sizeof(path))
+		return -EOVERFLOW;
 	dlist = sysfs_open_directory_list(path);
 	if (!dlist) {
 		metal_log(METAL_LOG_ERROR, "failed to scan class path %s\n",
@@ -200,10 +205,14 @@ static int metal_uio_dev_open(struct linux_bus *lbus, struct linux_device *ldev)
 	}
 
 	dlist_for_each_data(dlist, instance, char) {
-		snprintf(ldev->cls_path, sizeof(ldev->cls_path),
-			 "%s/%s", path, instance);
-		snprintf(ldev->dev_path, sizeof(ldev->dev_path),
-			 "/dev/%s", instance);
+		result = snprintf(ldev->cls_path, sizeof(ldev->cls_path),
+				  "%s/%s", path, instance);
+		if (result >= (int)sizeof(ldev->cls_path))
+			return -EOVERFLOW;
+		result = snprintf(ldev->dev_path, sizeof(ldev->dev_path),
+				  "/dev/%s", instance);
+		if (result >= (int)sizeof(ldev->dev_path))
+			return -EOVERFLOW;
 		break;
 	}
 	sysfs_close_list(dlist);
@@ -554,8 +563,10 @@ static int metal_linux_probe_driver(struct linux_bus *lbus,
 
 	/* Try probing the module and then open the driver. */
 	if (!ldrv->sdrv) {
-		snprintf(command, sizeof(command),
-			 "modprobe %s > /dev/null 2>&1", ldrv->mod_name);
+		ret = snprintf(command, sizeof(command),
+			       "modprobe %s > /dev/null 2>&1", ldrv->mod_name);
+		if (ret >= (int)sizeof(command))
+			return -EOVERFLOW;
 		ret = system(command);
 		if (ret < 0) {
 			metal_log(METAL_LOG_WARNING,
@@ -567,8 +578,10 @@ static int metal_linux_probe_driver(struct linux_bus *lbus,
 
 	/* Try sudo probing the module and then open the driver. */
 	if (!ldrv->sdrv) {
-		snprintf(command, sizeof(command),
-			 "sudo modprobe %s > /dev/null 2>&1", ldrv->mod_name);
+		ret = snprintf(command, sizeof(command),
+			       "sudo modprobe %s > /dev/null 2>&1", ldrv->mod_name);
+		if (ret >= (int)sizeof(command))
+			return -EOVERFLOW;
 		ret = system(command);
 		if (ret < 0) {
 			metal_log(METAL_LOG_WARNING,