X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fcrypto%2Fcaam_jr%2Fcaam_jr_uio.c;h=afd75c9a628709f67d09a9ab41d445c1b4371bda;hb=e162b8e910d2acd33d47844a776ea58e50231ce6;hp=c07d9db015e5a4de7ced1d21d74d776d28e185ed;hpb=e7a45f3cc245e5d077f2358a8641ce150a2e665a;p=dpdk.git

diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index c07d9db015..afd75c9a62 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -284,11 +284,11 @@ uio_map_registers(int uio_device_fd, int uio_device_id,
 	memset(uio_map_size_str, 0, sizeof(uio_map_size_str));
 
 	/* Compose string: /sys/class/uio/uioX */
-	sprintf(uio_sys_root, "%s/%s%d", SEC_UIO_DEVICE_SYS_ATTR_PATH,
-		"uio", uio_device_id);
+	snprintf(uio_sys_root, sizeof(uio_sys_root), "%s/%s%d",
+			SEC_UIO_DEVICE_SYS_ATTR_PATH, "uio", uio_device_id);
 	/* Compose string: maps/mapY */
-	sprintf(uio_sys_map_subdir, "%s%d", SEC_UIO_DEVICE_SYS_MAP_ATTR,
-		uio_map_id);
+	snprintf(uio_sys_map_subdir, sizeof(uio_sys_map_subdir), "%s%d",
+			SEC_UIO_DEVICE_SYS_MAP_ATTR, uio_map_id);
 
 	/* Read first (and only) line from file
 	 * /sys/class/uio/uioX/maps/mapY/size
@@ -332,7 +332,7 @@ free_job_ring(uint32_t uio_fd)
 	struct uio_job_ring *job_ring = NULL;
 	int i;
 
-	if (!job_ring->uio_fd)
+	if (!uio_fd)
 		return;
 
 	for (i = 0; i < MAX_SEC_JOB_RINGS; i++) {
@@ -362,8 +362,8 @@ free_job_ring(uint32_t uio_fd)
 			job_ring->register_base_addr,
 			(unsigned long)job_ring->map_size, strerror(errno));
 	} else
-		CAAM_JR_DEBUG("  JR UIO memory unmapped at %p",
-				job_ring->register_base_addr);
+		CAAM_JR_DEBUG("JR UIO memory is unmapped");
+
 	job_ring->register_base_addr = NULL;
 }
 
@@ -389,9 +389,8 @@ uio_job_ring *config_job_ring(void)
 
 	/* Find UIO device created by SEC kernel driver for this job ring. */
 	memset(uio_device_file_name, 0, sizeof(uio_device_file_name));
-
-	sprintf(uio_device_file_name, "%s%d", SEC_UIO_DEVICE_FILE_NAME,
-		job_ring->uio_minor_number);
+	snprintf(uio_device_file_name, sizeof(uio_device_file_name), "%s%d",
+			SEC_UIO_DEVICE_FILE_NAME, job_ring->uio_minor_number);
 
 	/* Open device file */
 	job_ring->uio_fd = open(uio_device_file_name, O_RDWR);
@@ -446,7 +445,11 @@ sec_configure(void)
 			ret = file_read_first_line(SEC_UIO_DEVICE_SYS_ATTR_PATH,
 					dir->d_name, "name", uio_name);
 			CAAM_JR_INFO("sec device uio name: %s", uio_name);
-			SEC_ASSERT(ret == 0, -1, "file_read_first_line failed");
+			if (ret != 0) {
+				CAAM_JR_ERR("file_read_first_line failed\n");
+				closedir(d);
+				return -1;
+			}
 
 			if (file_name_match_extract(uio_name,
 						SEC_UIO_DEVICE_NAME,