Fix 'keyctl pkey_query' argument parsing

keyctl's pkey_* operations each have an argument that allows specifying
a key password, but since that feature isn't currently supported, it
is supposed to always be passed in as "0":

	if (strcmp(argv[2], "0") != 0) {
		fprintf(stderr, "Password passing is not yet supported\n");
		exit(2);
	}

However, act_keyctl_pkey_query() has an off-by-one that makes it
start parsing key=value style option pairs at the password argument,
which causes the following error if the password argument is not in
key=value format:

	$ keyctl pkey_query 541826697 0
	Option not in key=val form
	$

And this error if the password argument is in key=value format:

	$ keyctl pkey_query 541826697 a=b
	Password passing is not yet supported
	$

This patch fixes act_keyctl_pkey_query() to start parsing key=value
pairs from the right place in its argument list, which gets it a
little further.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/keyctl.c b/keyctl.c
index 49a5ce4..c06777f 100644
--- a/keyctl.c
+++ b/keyctl.c
@@ -1896,7 +1896,7 @@ static void act_keyctl_pkey_query(int argc, char *argv[])
 
 	if (argc < 3)
 		format();
-	pkey_parse_info(argv + 2, info);
+	pkey_parse_info(argv + 3, info);
 
 	key = get_key_id(argv[1]);
 	if (strcmp(argv[2], "0") != 0) {