From: Keith Busch <keith.busch@intel.com>
Date: Mon, 5 Feb 2018 21:11:21 +0000 (-0700)
Subject: Merge branch 'master' into v1.6/iekey_to_no_argu
X-Git-Tag: v1.6~89^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=451692c02dbdff07c9cc73eb35463da105bd616a;p=users%2Fhch%2Fnvme-cli.git

Merge branch 'master' into v1.6/iekey_to_no_argu
---

451692c02dbdff07c9cc73eb35463da105bd616a
diff --cc nvme.c
index f069622,09b977d..499beef
--- a/nvme.c
+++ b/nvme.c
@@@ -3126,11 -3266,20 +3266,15 @@@ static int resv_release(int argc, char 
  	if (fd < 0)
  		return fd;
  
- 	if (!cfg.namespace_id)
+ 	if (!cfg.namespace_id) {
  		cfg.namespace_id = get_nsid(fd);
+ 		if (cfg.namespace_id <= 0)
+ 			return EINVAL;
+ 	}
 -	if (cfg.iekey > 1) {
 -		fprintf(stderr, "invalid iekey:%d\n", cfg.iekey);
 -		err = EINVAL;
 -		goto close_fd;
 -	}
  	if (cfg.rrela > 7) {
  		fprintf(stderr, "invalid rrela:%d\n", cfg.rrela);
- 		return EINVAL;
+ 		err = EINVAL;
+ 		goto close_fd;
  	}
  
  	err = nvme_resv_release(fd, cfg.namespace_id, cfg.rtype, cfg.rrela,