On Saturday 05 August 2006 7:56 am, Thomas Graf wrote:
> Collision between "[NetLabel]: SELinux support"  and
> "[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec"
>
> Signed-off-by: Thomas Graf <[EMAIL PROTECTED]>

I have no idea what the correct protocol is here, i.e. do I need to Ack this?  
However, I've never "Ack'd" anything before and I figure an extra Ack won't 
hurt anything :)

Acked-by: Paul Moore <[EMAIL PROTECTED]>

> Index: net-2.6.19.git/security/selinux/hooks.c
> ===================================================================
> --- net-2.6.19.git.orig/security/selinux/hooks.c
> +++ net-2.6.19.git/security/selinux/hooks.c
> @@ -3556,9 +3556,9 @@ static int selinux_socket_getpeersec_dgr
>       if (sock && (sock->sk->sk_family == PF_UNIX))
>               selinux_get_inode_sid(SOCK_INODE(sock), &peer_secid);
>       else if (skb) {
> -             peer_sid = selinux_netlbl_socket_getpeersec_dgram(skb);
> -             if (peer_sid == SECSID_NULL)
> -                     peer_sid = selinux_socket_getpeer_dgram(skb);
> +             peer_secid = selinux_netlbl_socket_getpeersec_dgram(skb);
> +             if (peer_secid == SECSID_NULL)
> +                     peer_secid = selinux_socket_getpeer_dgram(skb);
>       }
>
>       if (peer_secid == SECSID_NULL)
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [EMAIL PROTECTED]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
paul moore
linux security @ hp
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to