On Thu, Jul 07, 2016 at 09:51:52AM -0700, Dave Hansen wrote: > > Looks like MASK could have been statically defined and be a simple shift > > and mask known at compile time. Minor though. > > The VM_PKEY_BIT*'s are only ever defined as masks and not bit numbers. > So, if you want to use a mask, you end up doing something like: > > unsigned long mask = (NR_PKEYS-1) << ffz(~VM_PKEY_BIT0); > > Which ends up with the same thing, but I think ends up being pretty on > par for ugliness. > Fair enough. > >> +/* > >> + * When setting a userspace-provided value, we need to ensure > >> + * that it is valid. The __ version can get used by > >> + * kernel-internal uses like the execute-only support. > >> + */ > >> +int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, > >> + unsigned long init_val) > >> +{ > >> + if (!validate_pkey(pkey)) > >> + return -EINVAL; > >> + return __arch_set_user_pkey_access(tsk, pkey, init_val); > >> +} > > > > There appears to be a subtle bug fixed for validate_key. It appears > > there wasn't protection of the dedicated key before but nothing could > > reach it. > > Right. There was no user interface that took a key and we trusted that > the kernel knew what it was doing. > Ok. I was fairly sure that was the thinking behind it but wanted to be suire. > > The arch_max_pkey and PKEY_DEDICATE_EXECUTE_ONLY interaction is subtle > > but I can't find a problem with it either. > > > > That aside, the validate_pkey check looks weak. It might be a number > > that works but no guarantee it's an allocated key or initialised > > properly. At this point, garbage can be handed into the system call > > potentially but maybe that gets fixed later. > > It's called in three paths: > 1. by the kernel when setting up execute-only support > 2. by pkey_alloc() on the pkey we just allocated > 3. by pkey_set() on a pkey we just checked was allocated > > So, it isn't broken, but it's also not clear at all why it is safe and > what validate_pkey() is actually validating. > > But, that said, this does make me realize that with > pkey_alloc()/pkey_free(), this is probably redundant. We verify that > the key is allocated, and we only allow valid keys to be allocated. > > IOW, I think I can remove validate_pkey(), but only if we keep pkey_alloc(). > Ok, it's not a major problem. I simply worried that the protection of key slots is pretty weak as it can be interfered with from userspace. On the other hand, the kernel never interprets the information so it's unlikely to cause a security problem. Applications can still shoot themselves in the foot but hopefully the developers are aware that the protection they get with keys is not absolute. > ... > >> - newflags = calc_vm_prot_bits(prot, pkey); > >> + new_vma_pkey = arch_override_mprotect_pkey(vma, prot, pkey); > >> + newflags = calc_vm_prot_bits(prot, new_vma_pkey); > >> newflags |= (vma->vm_flags & ~(VM_READ | VM_WRITE | VM_EXEC)); > >> > > > > On CPUs that do not support the feature, arch_override_mprotect_pkey > > returns 0 and the normal protections are used. It's not clear how an > > application is meant to detect if the operation succeeded or not. What > > if the application relies on pkeys to be working? > > It actually shows up as -ENOSPC from pkey_alloc(). This sounds goofy, > but it teaches programs something very important: they always have to > look for ENOSPC, and must always be prepared to function without > protection keys. Ok, that makes sense. I don't think it's goofy. Sure, they cannot detect the CPU support directly from the interface but it's close enough. -- Mel Gorman SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>