Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5208cc83 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

keys, trusted: fix: *do not* allow duplicate key options 



The trusted keys option parsing allows specifying the same option
multiple times. The last option value specified is used.

This is problematic because:

* No gain.
* This makes complicated to specify options that are dependent on other
  options.

This patch changes the behavior in a way that option can be specified
only once.

Reported-by: default avatarJames Morris James Morris <jmorris@namei.org>
Reviewed-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Acked-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent 6674ff14

security/keys/trusted.c

+3 −0
Original line number Diff line number Diff line
@@ -736,11 +736,14 @@ static int getoptions(char *c, struct trusted_key_payload *pay, 
	int res;

	unsigned long handle;

	unsigned long lock;

	unsigned long token_mask = 0;



	while ((p = strsep(&c, " \t"))) {

		if (*p == '\0' || *p == ' ' || *p == '\t')

			continue;

		token = match_token(p, key_tokens, args);

		if (test_and_set_bit(token, &token_mask))

			return -EINVAL;



		switch (token) {

		case Opt_pcrinfo: