Acked-By: Nick Kralevich <n...@google.com>

On Thu, Feb 26, 2015 at 1:54 PM, Jeff Vander Stoep <je...@google.com> wrote:
> Commit f01e1af445fa ("selinux: don't pass in NULL avd to 
> avc_has_perm_noaudit")
> made this pointer reassignment unnecessary. Avd should continue to reference
> the stack-based copy.
>
> Signed-off-by: Jeff Vander Stoep <je...@google.com>
> ---
>  security/selinux/avc.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/security/selinux/avc.c b/security/selinux/avc.c
> index afcc0ae..3c17dda 100644
> --- a/security/selinux/avc.c
> +++ b/security/selinux/avc.c
> @@ -724,12 +724,10 @@ inline int avc_has_perm_noaudit(u32 ssid, u32 tsid,
>         rcu_read_lock();
>
>         node = avc_lookup(ssid, tsid, tclass);
> -       if (unlikely(!node)) {
> +       if (unlikely(!node))
>                 node = avc_compute_av(ssid, tsid, tclass, avd);
> -       } else {
> +       else
>                 memcpy(avd, &node->ae.avd, sizeof(*avd));
> -               avd = &node->ae.avd;
> -       }
>
>         denied = requested & ~(avd->allowed);
>         if (unlikely(denied))
> --
> 2.2.0.rc0.207.ga3a616c
>
> _______________________________________________
> Selinux mailing list
> seli...@tycho.nsa.gov
> To unsubscribe, send email to selinux-le...@tycho.nsa.gov.
> To get help, send an email containing "help" to selinux-requ...@tycho.nsa.gov.



-- 
Nick Kralevich | Android Security | n...@google.com | 650.214.4037
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to