On Tue, 2008-11-04 at 10:35 -0600, Serge E. Hallyn wrote:
Quoting Eric Paris (eparis(a)redhat.com):
> diff --git a/security/commoncap.c b/security/commoncap.c
> index 8bb95ed..534abb5 100644
> --- a/security/commoncap.c
> +++ b/security/commoncap.c
> @@ -8,6 +8,7 @@
> */
>
> #include <linux/capability.h>
> +#include <linux/audit.h>
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> @@ -373,6 +374,9 @@ int cap_bprm_set_security (struct linux_binprm *bprm)
>
> void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe)
> {
> + kernel_cap_t pP = current->cap_permitted;
> + kernel_cap_t pE = current->cap_effective;
> +
> if (bprm->e_uid != current->uid || bprm->e_gid != current->gid ||
> !cap_issubset(bprm->cap_post_exec_permitted,
> current->cap_permitted)) {
> @@ -407,6 +411,12 @@ void cap_bprm_apply_creds (struct linux_binprm *bprm, int
unsafe)
> }
>
> /* AUD: Audit candidate if current->cap_effective is set */
> + if (!cap_isclear(current->cap_effective)) {
> + if (!cap_issubset(current->cap_effective, CAP_FULL_SET) ||
Hi Eric,
can you explain what the cap_issubset() check is for here?
thanks,
-serge
> + (bprm->e_uid != 0) || (current->uid != 0) ||
> + issecure(SECURE_NOROOT))
> + audit_log_bprm_fcaps(bprm, &pP, &pE);
So here's the problem.... I can't fail this syscall, it's too late. I
can do a couple of things.
1) waste lots of space in the execve record so we know memory has
already been allocated
2) just ignore the memory failure and don't worry about it. We are
still going to get the fcaps info from the patch record and should be
able to piece together the starting and finishing caps by looking at
past audit records if you really need it.
3) I can call audit_log_lost(). I don't think we know are this time
that we really needed this record, but this is the 'safest' approach.
If people have their machines set to panic on lost records we would
panic. Honestly though, if we don't have enough memory to satisfy this
request (we're talking about 72 bytes or something?) we are going to
fail the next audit message, so doing it now would be just fine.
I vote #2 since I don't think we are really going to have any lose of
info. But if people want it I'll go #3 since I don't think it will hurt
anything.
-Eric