Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hardening-v6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- Also undef LATENT_ENTROPY_PLUGIN for per-file disabling (Andrew
Donnellan)
- Return EFAULT on copy_from_user() failures in LoadPin (Kees Cook)
* tag 'hardening-v6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
gcc-plugins: Undefine LATENT_ENTROPY_PLUGIN when plugin disabled for a file
LoadPin: Return EFAULT on copy_from_user() failures
+3
-5
+1
-1
scripts/Makefile.gcc-plugins
+1
-1
scripts/Makefile.gcc-plugins
···
4
4
gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY) \
5
5
+= -DLATENT_ENTROPY_PLUGIN
6
6
ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
7
-
DISABLE_LATENT_ENTROPY_PLUGIN += -fplugin-arg-latent_entropy_plugin-disable
7
+
DISABLE_LATENT_ENTROPY_PLUGIN += -fplugin-arg-latent_entropy_plugin-disable -ULATENT_ENTROPY_PLUGIN
8
8
endif
9
9
export DISABLE_LATENT_ENTROPY_PLUGIN
10
10
+2
-4
security/loadpin/loadpin.c
+2
-4
security/loadpin/loadpin.c
···
356
356
{
357
357
void __user *uarg = (void __user *)arg;
358
358
unsigned int fd;
359
-
int rc;
360
359
361
360
switch (cmd) {
362
361
case LOADPIN_IOC_SET_TRUSTED_VERITY_DIGESTS:
363
-
rc = copy_from_user(&fd, uarg, sizeof(fd));
364
-
if (rc)
365
-
return rc;
362
+
if (copy_from_user(&fd, uarg, sizeof(fd)))
363
+
return -EFAULT;
366
364
367
365
return read_trusted_verity_root_digests(fd);
368
366