KEYS: fix parsing invalid pkey info string

We need to check the return value of match_token() for Opt_err before doing anything with it. [ Not only did the old "-1" value for Opt_err cause problems for the __test_and_set_bit(), as fixed in commit 94c13f6 ("security: don't use a negative Opt_err token index"), but accessing "args[0].from" is invalid for the Opt_err case, as pointed out by Eric later. - Linus ] Reported-by: [email protected] Fixes: 00d60fd ("KEYS: Provide keyctls to drive the new key type ops for asymmetric keys [ver #2]") Signed-off-by: Eric Biggers <[email protected]> Cc: [email protected] # 4.20 Signed-off-by: Linus Torvalds <[email protected]>
jakajancar · Jan 1, 2019 · 57b0e31 · 57b0e31
1 parent e1ef035
commit 57b0e31
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/security/keys/keyctl_pkey.c b/security/keys/keyctl_pkey.c
@@ -50,6 +50,8 @@ static int keyctl_pkey_params_parse(struct kernel_pkey_params *params)
 		if (*p == '\0' || *p == ' ' || *p == '\t')
 			continue;
 		token = match_token(p, param_keys, args);
+		if (token == Opt_err)
+			return -EINVAL;
 		if (__test_and_set_bit(token, &token_mask))
 			return -EINVAL;
 		q = args[0].from;