On Friday, May 17, 2013 11:23:03 PM Sergei Shtylyov wrote:
> Hello.
>
> On 05/17/2013 11:08 PM, Paul Moore wrote:
> > The net/netlabel/netlabel_domainhash.c:netlbl_domhsh_add() function
> > does not properly validate new domain hash entries resulting in
> > potential problems when an administrator attempts to add an invalid
> > entry. One such problem, as reported by Vlad Halilov, is a kernel
> > BUG (found in netlabel_domainhash.c:netlbl_domhsh_audit_add()) when
> > adding an IPv6 outbound mapping with a CIPSO configuration.
> >
> > This patch corrects this problem by adding the necessary validation
> > code to netlbl_domhsh_add() via the newly created
> > netlbl_domhsh_validate() function.
> >
> > Ideally this patch should also be pushed to the currently active
> > -stable trees.
> >
> > Reported-by: Vlad Halilov <vlad.halilov@xxxxxxxxx>
> > Signed-off-by: Paul Moore <pmoore@xxxxxxxxxx>
...
> > +#if IS_ENABLED(CONFIG_IPV6)
>
> Why not:
>
> if (IS_ENABLED(CONFIG_IPV6))
>
> #if's in the function body are frowned upon.
The dependent functions/types are not defined when !IS_ENABLED(CONFIG_IPV6);
please look at the rest of the NetLabel code (net/netlabel).
Perhaps we can do some work to fixup some of that in the future, but that
shouldn't hold up this fix.
> > + netlbl_af6list_foreach(iter6, &entry->type_def.addrsel->list6) {
> > + map6 = netlbl_domhsh_addr6_entry(iter6);
> > + switch (map6->type) {
> > + case NETLBL_NLTYPE_UNLABELED:
> > + break;
> > + default:
> > + return -EINVAL;
> > + }
> > + }
> > +#endif /* IPv6 */
> > + break;
> > + default:
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
--
paul moore
security and virtualization @ redhat
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.
