[Midnightbsd-cvs] src [9088] trunk/sys/cam/ctl/ctl_backend_block.c: dont dereference userland pointer.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Oct 1 06:31:35 EDT 2016


Revision: 9088
          http://svnweb.midnightbsd.org/src/?rev=9088
Author:   laffer1
Date:     2016-10-01 06:31:34 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
dont dereference userland pointer.

Modified Paths:
--------------
    trunk/sys/cam/ctl/ctl_backend_block.c

Modified: trunk/sys/cam/ctl/ctl_backend_block.c
===================================================================
--- trunk/sys/cam/ctl/ctl_backend_block.c	2016-10-01 10:30:49 UTC (rev 9087)
+++ trunk/sys/cam/ctl/ctl_backend_block.c	2016-10-01 10:31:34 UTC (rev 9088)
@@ -1671,7 +1671,7 @@
 
 	if (be_lun->ctl_be_lun.lun_type == T_DIRECT) {
 		for (i = 0; i < req->num_be_args; i++) {
-			if (strcmp(req->kern_be_args[i].name, "file") == 0) {
+			if (strcmp(req->kern_be_args[i].kname, "file") == 0) {
 				file_arg = &req->kern_be_args[i];
 				break;
 			}
@@ -1686,7 +1686,7 @@
 		be_lun->dev_path = malloc(file_arg->vallen, M_CTLBLK,
 					  M_WAITOK | M_ZERO);
 
-		strlcpy(be_lun->dev_path, (char *)file_arg->value,
+		strlcpy(be_lun->dev_path, (char *)file_arg->kvalue,
 			file_arg->vallen);
 
 		retval = ctl_be_block_open(softc, be_lun, req);
@@ -1725,7 +1725,7 @@
 	 * the loop above,
 	 */
 	for (i = 0; i < req->num_be_args; i++) {
-		if (strcmp(req->kern_be_args[i].name, "num_threads") == 0) {
+		if (strcmp(req->kern_be_args[i].kname, "num_threads") == 0) {
 			struct ctl_be_arg *thread_arg;
 			char num_thread_str[16];
 			int tmp_num_threads;
@@ -1733,7 +1733,7 @@
 
 			thread_arg = &req->kern_be_args[i];
 
-			strlcpy(num_thread_str, (char *)thread_arg->value,
+			strlcpy(num_thread_str, (char *)thread_arg->kvalue,
 				min(thread_arg->vallen,
 				sizeof(num_thread_str)));
 



More information about the Midnightbsd-cvs mailing list