* Re: [SELinux]: selinux_socket_getpeersec_dgram() compile fix
2006-08-05 11:56 [SELinux]: selinux_socket_getpeersec_dgram() compile fix Thomas Graf
@ 2006-08-05 13:02 ` James Morris
2006-08-05 20:11 ` David Miller
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: James Morris @ 2006-08-05 13:02 UTC (permalink / raw)
To: Thomas Graf; +Cc: davem, paul.moore, cxzhang, netdev
On Sat, 5 Aug 2006, 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 <tgraf@suug•ch>
Acked-by: James Morris <jmorris@namei•org>
>
> 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)
>
--
James Morris
<jmorris@namei•org>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [SELinux]: selinux_socket_getpeersec_dgram() compile fix
2006-08-05 11:56 [SELinux]: selinux_socket_getpeersec_dgram() compile fix Thomas Graf
2006-08-05 13:02 ` James Morris
@ 2006-08-05 20:11 ` David Miller
2006-08-05 20:12 ` Paul Moore
2006-08-07 4:07 ` Xiaolan Zhang
3 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2006-08-05 20:11 UTC (permalink / raw)
To: tgraf; +Cc: paul.moore, cxzhang, jmorris, netdev
From: Thomas Graf <tgraf@suug•ch>
Date: Sat, 5 Aug 2006 13:56:20 +0200
> Collision between "[NetLabel]: SELinux support" and
> "[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec"
>
> Signed-off-by: Thomas Graf <tgraf@suug•ch>
Thanks Thomas, I obviously didn't resolve that by hand properly :-/
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [SELinux]: selinux_socket_getpeersec_dgram() compile fix
2006-08-05 11:56 [SELinux]: selinux_socket_getpeersec_dgram() compile fix Thomas Graf
2006-08-05 13:02 ` James Morris
2006-08-05 20:11 ` David Miller
@ 2006-08-05 20:12 ` Paul Moore
2006-08-05 20:16 ` David Miller
2006-08-07 4:07 ` Xiaolan Zhang
3 siblings, 1 reply; 6+ messages in thread
From: Paul Moore @ 2006-08-05 20:12 UTC (permalink / raw)
To: Thomas Graf; +Cc: davem, cxzhang, jmorris, netdev
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 <tgraf@suug•ch>
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 <paul.moore@hp•com>
> 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 majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
paul moore
linux security @ hp
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [SELinux]: selinux_socket_getpeersec_dgram() compile fix
2006-08-05 20:12 ` Paul Moore
@ 2006-08-05 20:16 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2006-08-05 20:16 UTC (permalink / raw)
To: paul.moore; +Cc: tgraf, cxzhang, jmorris, netdev
From: Paul Moore <paul.moore@hp•com>
Date: Sat, 5 Aug 2006 16:12:51 -0400
> 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 <tgraf@suug•ch>
>
> 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 <paul.moore@hp•com>
You don't have to, but it's nice as it adds assurance to other
reviews that the patch might be correct because someone else
thinks it is :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [SELinux]: selinux_socket_getpeersec_dgram() compile fix
2006-08-05 11:56 [SELinux]: selinux_socket_getpeersec_dgram() compile fix Thomas Graf
` (2 preceding siblings ...)
2006-08-05 20:12 ` Paul Moore
@ 2006-08-07 4:07 ` Xiaolan Zhang
3 siblings, 0 replies; 6+ messages in thread
From: Xiaolan Zhang @ 2006-08-07 4:07 UTC (permalink / raw)
To: Thomas Graf; +Cc: cxzhang, davem, jmorris, netdev, paul.moore
Acked-by: Catherine Zhang <cxzhang@watson•ibm.com>
Thomas Graf <tgraf@suug•ch> wrote on 08/05/2006 07:56:20 AM:
> Collision between "[NetLabel]: SELinux support" and
> "[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec"
>
> Signed-off-by: Thomas Graf <tgraf@suug•ch>
>
> 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)
^ permalink raw reply [flat|nested] 6+ messages in thread