ebiederm@xxxxxxxxxxxx (Eric W. Biederman) writes:
> Amir Goldstein <amir73il@xxxxxxxxx> writes:
>
>>> diff --git a/fs/exec.c b/fs/exec.c
>>> index 6fcfb3f7b137..f724ed94ba7a 100644
>>> --- a/fs/exec.c
>>> +++ b/fs/exec.c
>>> @@ -1270,12 +1270,21 @@ EXPORT_SYMBOL(flush_old_exec);
>>>
>>> void would_dump(struct linux_binprm *bprm, struct file *file)
>>> {
>>> - if (inode_permission(file_inode(file), MAY_READ) < 0)
>>> + struct inode *inode = file_inode(file);
>>> + if (inode_permission(inode, MAY_READ) < 0) {
>>> + struct user_namespace *user_ns = current->mm->user_ns;
>>> bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
>>> +
>>> + /* May the user_ns root read the executable? */
>>> + if (!kuid_has_mapping(user_ns, inode->i_uid) ||
>>> + !kgid_has_mapping(user_ns, inode->i_gid)) {
>>> + bprm->interp_flags |= BINPRM_FLAGS_EXEC_INACCESSIBLE;
>>> + }
>>
>> This feels like it should belong inside
>> inode_permission(file_inode(file), MAY_EXEC)
>> which hopefully should be checked long before getting here??
>
> It is the active ingredient in capable_wrt_inode_uidgid and is indeed
> inside of inode_permission.
>
> What I am testing for here is if I have a process with a full
> set of capabilities in current->mm->user_ns will the inode be readable.
>
> I can see an argument for calling prepare_creds stuffing the new cred
> full of capabilities. Calling override_cred. Calling inode_permission,
> restoring the credentials. But it seems very much like overkill and
> more error prone because of the more code involved.
>
> So I have done the simple thing that doesn't hide what is really going on.
At the same time I can see the addition of a helper function
bool ns_inode(struct user_namespace *user_ns, struct inode *inode)
{
return kuid_has_mapping(user_ns, inode->i_uid) &&
kgid_has_mapping(user_ns, inode->i_gid);
}
That abstracts out the concept instead of open codes it.
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
