Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Dec 2018 02:34:19 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r342467 - stable/12/usr.sbin/ctladm
Message-ID:  <201812260234.wBQ2YJJS079081@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Wed Dec 26 02:34:18 2018
New Revision: 342467
URL: https://svnweb.freebsd.org/changeset/base/342467

Log:
  MFC r342349: Fix passing wrong variables to nvlist_destroy() after r333446.
  
  Reported by:	Alexander Fedorov (IT-Grad.ru)

Modified:
  stable/12/usr.sbin/ctladm/ctladm.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/12/usr.sbin/ctladm/ctladm.c	Tue Dec 25 15:18:41 2018	(r342466)
+++ stable/12/usr.sbin/ctladm/ctladm.c	Wed Dec 26 02:34:18 2018	(r342467)
@@ -667,7 +667,7 @@ cctl_port(int fd, int argc, char **argv, char *combine
 	}
 
 bailout:
-	nvlist_destroy(req.args_nvl);
+	nvlist_destroy(option_list);
 	free(driver);
 	return (retval);
 
@@ -2542,7 +2542,7 @@ cctl_create_lun(int fd, int argc, char **argv, char *c
 	fprintf(stdout, "Device ID:     %s\n", req.reqdata.create.device_id);
 
 bailout:
-	nvlist_destroy(req.args_nvl);
+	nvlist_destroy(option_list);
 	return (retval);
 }
 
@@ -2644,7 +2644,7 @@ cctl_rm_lun(int fd, int argc, char **argv, char *combi
 	printf("LUN %d removed successfully\n", lun_id);
 
 bailout:
-	nvlist_destroy(req.args_nvl);
+	nvlist_destroy(option_list);
 	return (retval);
 }
 
@@ -2764,7 +2764,7 @@ cctl_modify_lun(int fd, int argc, char **argv, char *c
 	printf("LUN %d modified successfully\n", lun_id);
 
 bailout:
-	nvlist_destroy(req.args_nvl);
+	nvlist_destroy(option_list);
 	return (retval);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812260234.wBQ2YJJS079081>