From: Chris Hanna <hannac@iu.edu>
Date: Wed, 26 Apr 2017 13:43:55 +0000 (-0400)
Subject: LU-9336 utils: prevent key clobber and clarify lgss_sk usage
X-Git-Tag: 2.9.57~19
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=236651f59c321cadb66043a5d31174e8ec74c043

LU-9336 utils: prevent key clobber and clarify lgss_sk usage

Prevent lgss_sk from overwriting key value when modifying attributes.
Altered usage text to match, and clarified that the input source is
the key value, not a source of randomization for key generation.

Signed-off-by: Chris Hanna <hannac@iu.edu>
Change-Id: I87b9d59b65f3172b0425115441eaa1456489daeb
Reviewed-on: https://review.whamcloud.com/26838
Tested-by: Jenkins
Reviewed-by: Kit Westneat <kit.westneat@gmail.com>
Reviewed-by: Nathan Lavender <nblavend@iu.edu>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/utils/gss/lgss_sk.c b/lustre/utils/gss/lgss_sk.c
index 15ff3fc..825146e 100644
--- a/lustre/utils/gss/lgss_sk.c
+++ b/lustre/utils/gss/lgss_sk.c
@@ -133,8 +133,9 @@ static void usage(FILE *fp, char *program)
 		"client)\n");
 	fprintf(fp, "-k|--key-bits   <len>	Shared key length in bits "
 		"(Default: %d)\n", SK_DEFAULT_SK_KEYLEN);
-	fprintf(fp, "-d|--data       <file>	Key random data source "
-		"(Default: /dev/random)\n\n");
+	fprintf(fp, "-d|--data       <file>	Key data source for new keys "
+		"(Default: /dev/random)\n");
+	fprintf(fp, "                        Not a seed value.  This is the actual key value.\n\n");
 	fprintf(fp, "Other Options:\n");
 	fprintf(fp, "-v|--verbose           Increase verbosity for errors\n");
 	exit(EXIT_FAILURE);
@@ -498,6 +499,10 @@ int main(int argc, char **argv)
 		fprintf(stderr, "error: invalid HMAC algorithm specified\n");
 		return EXIT_FAILURE;
 	}
+	if (modify && datafile) {
+		fprintf(stderr, "error: data file option not valid in key modify\n");
+		return EXIT_FAILURE;
+	}
 
 	if (modify) {
 		config = sk_read_file(modify);