linux-stable.git/security/integrity, branch linux-5.16.y

EVM: fix the evm= __setup handler return value

2022-04-08T12:05:38+00:00

[ Upstream commit f2544f5e6c691679d56bb38637d2f347075b36fa ]

__setup() handlers should return 1 if the parameter is handled.
Returning 0 causes the entire string to be added to init's
environment strings (limited to 32 strings), unnecessarily polluting it.

Using the documented string "evm=fix" causes an Unknown parameter message:
  Unknown kernel command line parameters
  "BOOT_IMAGE=/boot/bzImage-517rc5 evm=fix", will be passed to user space.

and that string is added to init's environment string space:
  Run /sbin/init as init process
    with arguments:
     /sbin/init
    with environment:
     HOME=/
     TERM=linux
     BOOT_IMAGE=/boot/bzImage-517rc5
     evm=fix

With this change, using "evm=fix" acts as expected and an invalid
option ("evm=evm") causes a warning to be printed:
  evm: invalid "evm" mode
but init's environment is not polluted with this string, as expected.

Fixes: 7102ebcd65c1 ("evm: permit only valid security.evm xattrs to be updated")
Signed-off-by: Randy Dunlap 
Reported-by: Igor Zhbanov 
Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
Signed-off-by: Mimi Zohar 
Signed-off-by: Sasha Levin

ima: Do not print policy rule with inactive LSM labels

2022-02-16T11:58:06+00:00

commit 89677197ae709eb1ab3646952c44f6a171c9e74c upstream.

Before printing a policy rule scan for inactive LSM labels in the policy
rule. Inactive LSM labels are identified by args_p != NULL and
rule == NULL.

Fixes: 483ec26eed42 ("ima: ima/lsm policy rule loading logic bug fixes")
Signed-off-by: Stefan Berger 
Cc:  # v5.6+
Acked-by: Christian Brauner 
[zohar@linux.ibm.com: Updated "Fixes" tag]
Signed-off-by: Mimi Zohar 
Signed-off-by: Greg Kroah-Hartman

ima: Allow template selection with ima_template[_fmt]= after ima_hash=

2022-02-16T11:58:06+00:00

commit bb8e52e4906f148c2faf6656b5106cf7233e9301 upstream.

Commit c2426d2ad5027 ("ima: added support for new kernel cmdline parameter
ima_template_fmt") introduced an additional check on the ima_template
variable to avoid multiple template selection.

Unfortunately, ima_template could be also set by the setup function of the
ima_hash= parameter, when it calls ima_template_desc_current(). This causes
attempts to choose a new template with ima_template= or with
ima_template_fmt=, after ima_hash=, to be ignored.

Achieve the goal of the commit mentioned with the new static variable
template_setup_done, so that template selection requests after ima_hash=
are not ignored.

Finally, call ima_init_template_list(), if not already done, to initialize
the list of templates before lookup_template_desc() is called.

Reported-by: Guo Zihua 
Signed-off-by: Roberto Sassu 
Cc: stable@vger.kernel.org
Fixes: c2426d2ad5027 ("ima: added support for new kernel cmdline parameter ima_template_fmt")
Signed-off-by: Mimi Zohar 
Signed-off-by: Greg Kroah-Hartman

ima: Remove ima_policy file before directory

2022-02-16T11:58:05+00:00

commit f7333b9572d0559e00352a926c92f29f061b4569 upstream.

The removal of ima_dir currently fails since ima_policy still exists, so
remove the ima_policy file before removing the directory.

Fixes: 4af4662fa4a9 ("integrity: IMA policy")
Signed-off-by: Stefan Berger 
Cc: 
Acked-by: Christian Brauner 
Signed-off-by: Mimi Zohar 
Signed-off-by: Greg Kroah-Hartman

ima: fix reference leak in asymmetric_verify()

2022-02-16T11:58:05+00:00

commit 926fd9f23b27ca6587492c3f58f4c7f4cd01dad5 upstream.

Don't leak a reference to the key if its algorithm is unknown.

Fixes: 947d70597236 ("ima: Support EC keys for signature verification")
Cc:  # v5.13+
Signed-off-by: Eric Biggers 
Reviewed-by: Stefan Berger 
Reviewed-by: Tianjia Zhang 
Signed-off-by: Mimi Zohar 
Signed-off-by: Greg Kroah-Hartman

integrity: check the return value of audit_log_start()

2022-02-16T11:58:05+00:00

commit 83230351c523b04ff8a029a4bdf97d881ecb96fc upstream.

audit_log_start() returns audit_buffer pointer on success or NULL on
error, so it is better to check the return value of it.

Fixes: 3323eec921ef ("integrity: IMA as an integrity service provider")
Signed-off-by: Xiaoke Wang 
Cc: 
Reviewed-by: Paul Moore 
Signed-off-by: Mimi Zohar 
Signed-off-by: Greg Kroah-Hartman

evm: mark evm_fixmode as __ro_after_init

2021-10-28T22:52:49+00:00

The evm_fixmode is only configurable by command-line option and it is never
modified outside initcalls, so declaring it with __ro_after_init is better.

Signed-off-by: Austin Kim 
Cc: stable@vger.kernel.org
Signed-off-by: Mimi Zohar

ima: Use strscpy instead of strlcpy

2021-10-10T02:17:58+00:00

strlcpy is deprecated, use its safer replacement.

Signed-off-by: Petr Vorel 
Signed-off-by: Mimi Zohar

ima_policy: Remove duplicate 'the' in docs comment

2021-10-10T02:17:57+00:00

Also join string (short enough to be on single line).

Signed-off-by: Petr Vorel 
Signed-off-by: Mimi Zohar

ima: add gid support

2021-10-10T02:17:57+00:00

IMA currently supports the concept of rules based on uid where the rule
is based on the uid of the file owner or the uid of the user accessing
the file. Provide the ability to have similar rules based on gid.

Signed-off-by: Curtis Veit 
Co-developed-by: Alex Henrie 
Signed-off-by: Alex Henrie 
Reviewed-by: Petr Vorel 
Signed-off-by: Mimi Zohar