nlmon updates
Subsystems (3)
v3 cover nlmon updates
Daniel Borkmann (2):
netlink: only do not deliver to tap when both sides are kernel sks
netlink: specify netlink packet direction for nlmon
include/uapi/linux/if_packet.h | 4 +++- net/netlink/af_netlink.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.11.7
PATCH v3 1/2 netlink: only do not deliver to tap when both sides are kernel sks
We should also deliver packets to nlmon devices when we are in netlink_unicast_kernel(), and only one of the {src,dst} sockets is user sk and the other one kernel sk. That's e.g. the case in netlink diag, netlink route, etc. Still, forbid to deliver messages from kernel to kernel sks.
---
v1->v2->v3:
- unchanged
net/netlink/af_netlink.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/netlink/af_netlink.c +8 -5
@@ -239,6 +239,13 @@ static void netlink_deliver_tap(struct sk_buff *skb)rcu_read_unlock (); } +static void netlink_deliver_tap_kernel (struct sock *dst,struct sock *src, +struct sk_buff *skb) +{ +if (!(netlink_is_kernel (dst) &&netlink_is_kernel (src))) +netlink_deliver_tap (skb); +} +static void netlink_overrun (struct sock *sk) {struct netlink_sock *nlk =nlk_sk (sk);
@@ -1697,14 +1704,10 @@ static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb, ret = -ECONNREFUSED ;if (nlk->netlink_rcv !=NULL ) { -/* We could do a netlink_deliver_tap(skb) here as well -* but since this is intended for the kernel only, we -* should rather let it stay under the hood. -*/ - ret = skb->len;netlink_skb_set_owner_r (skb, sk);NETLINK_CB (skb).sk = ssk; +netlink_deliver_tap_kernel (sk, ssk, skb); nlk->netlink_rcv (skb);consume_skb (skb); }else {
Signature · 1 line
1.7.11.7
PATCH v3 2/2 netlink: specify netlink packet direction for nlmon
In reply to Daniel BorkmannIn order to facilitate development for netlink protocol dissector, fill the unused field skb->pkt_type of the cloned skb with a hint of the address space of the new owner (receiver) socket in the notion of "to kernel" resp. "to user".
At the time we invoke __netlink_deliver_tap_skb(), we already have set the new skb owner via netlink_skb_set_owner_r(), so we can use that for netlink_is_kernel() probing.
In normal PF_PACKET network traffic, this field denotes if the packet is destined for us (PACKET_HOST), if it's broadcast (PACKET_BROADCAST), etc.
As we only have 3 bit reserved, we can use the value (= 6) of PACKET_FASTROUTE as it's _not used_ anywhere in the whole kernel and not supported anywhere, and packets of such type were never exposed to user space, so there are no overlapping users of such kind. Thus, as wished, that seems the only way to make both PACKET_* values non-overlapping and therefore device agnostic.
By using those two flags for netlink skbs on nlmon devices, they can be made available and picked up via sll_pkttype (previously unused in netlink context) in struct sockaddr_ll. We now have these two directions:
- PACKET_USER (= 6) -> to user space - PACKET_KERNEL (= 7) -> to kernel space
Partial ip a example strace for sa_family=AF_NETLINK with detected nl msg direction:
syscall: direction: sendto(3, ...) = 40 /* to kernel */ recvmsg(3, ...) = 3404 /* to user */ recvmsg(3, ...) = 1120 /* to user */ recvmsg(3, ...) = 20 /* to user */ sendto(3, ...) = 40 /* to kernel */ recvmsg(3, ...) = 168 /* to user */ recvmsg(3, ...) = 144 /* to user */ recvmsg(3, ...) = 20 /* to user */
---
v1->v2:
- let PACKET_* values not overlap as requested by Dave
v2->v3:
- fixed typo in comment spotted by Nicolas, thanks
include/uapi/linux/if_packet.h | 4 +++- net/netlink/af_netlink.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
include/uapi/linux/if_packet.h +3 -1
@@ -26,8 +26,10 @@ struct sockaddr_ll {#define PACKET_MULTICAST 2/* To group */ #define PACKET_OTHERHOST 3/* To someone else */ #define PACKET_OUTGOING 4/* Outgoing of any type */ -/* These ones are invisible by user level */ #define PACKET_LOOPBACK 5/* MC/BRD frame looped back */ +#define PACKET_USER 6/* To user space */ +#define PACKET_KERNEL 7/* To kernel space */ +/* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */ #define PACKET_FASTROUTE 6/* Fastrouted frame */ /* Packet socket options */
net/netlink/af_netlink.c +2 -0
@@ -204,6 +204,8 @@ static int __netlink_deliver_tap_skb(struct sk_buff *skb,if (nskb) { nskb->dev = dev; nskb->protocol =htons ((u16 ) sk->sk_protocol); + nskb->pkt_type =netlink_is_kernel (sk) ? +PACKET_KERNEL :PACKET_USER ; ret =dev_queue_xmit (nskb);if (unlikely (ret >0 ))
Signature · 1 line
1.7.11.7
Re: [PATCH net-next v3 2/2] netlink: specify netlink packet direction for nlmon
Quoted 58 lines · Daniel Borkmann
In order to facilitate development for netlink protocol dissector, fill the unused field
skb->pkt_typeof the cloned skb with a hint of the address space of the new owner (receiver) socket in the notion of "to kernel" resp. "to user".At the time we invoke
__netlink_deliver_tap_skb(), we already have set the new skb owner vianetlink_skb_set_owner_r(), so we can use that fornetlink_is_kernel()probing.In normal
PF_PACKETnetwork traffic, this field denotes if the packet is destined for us (PACKET_HOST), if it's broadcast (PACKET_BROADCAST), etc.As we only have 3 bit reserved, we can use the value (= 6) of
PACKET_FASTROUTEas it's_notused_anywhere in the whole kernel and not supported anywhere, and packets of such type were never exposed to user space, so there are no overlapping users of such kind. Thus, as wished, that seems the only way to make both PACKET_* values non-overlapping and therefore device agnostic.By using those two flags for netlink skbs on nlmon devices, they can be made available and picked up via
sll_pkttype(previously unused in netlink context) in structsockaddr_ll. We now have these two directions:- PACKET_USER (= 6) -> to user space - PACKET_KERNEL (= 7) -> to kernel spacePartial
ip aexample strace for sa_family=AF_NETLINK with detected nl msg direction:syscall: direction: sendto(3, ...) = 40 /* to kernel */ recvmsg(3, ...) = 3404 /* to user */ recvmsg(3, ...) = 1120 /* to user */ recvmsg(3, ...) = 20 /* to user */ sendto(3, ...) = 40 /* to kernel */ recvmsg(3, ...) = 168 /* to user */ recvmsg(3, ...) = 144 /* to user */ recvmsg(3, ...) = 20 /* to user */Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Jakub Zawadzki <[email protected]>---
v1->v2:
- let PACKET_* values not overlap as requested by Dave
v2->v3:
- fixed typo in comment spotted by Nicolas, thanksinclude/uapi/linux/if_packet.h | 4 +++- net/netlink/af_netlink.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)include/uapi/linux/if_packet.h +0
-0
include/uapi/linux/if_packet.h struct sockaddr_ll { · line 33
Quoted 9 lines
include/uapi/linux/if_packet.h +3
-1@@ -26,8 +26,10 @@ struct sockaddr_ll {#define PACKET_MULTICAST 2/* To group */ #define PACKET_OTHERHOST 3/* To someone else */ #define PACKET_OUTGOING 4/* Outgoing of any type */ -/* These ones are invisible by user level */ #define PACKET_LOOPBACK 5/* MC/BRD frame looped back */ +#define PACKET_USER 6/* To user space */ +#define PACKET_KERNEL 7/* To kernel space */ +/* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */ #define PACKET_FASTROUTE 6/* Fastrouted frame */
Sorry to insist, I just try to understand. Why not removing the definition of PACKET_FASTROUTE?
Or have a name like PACKET_NL_USER to document the difference between both cases?
Re: [PATCH net-next v3 2/2] netlink: specify netlink packet direction for nlmon
Quoted 64 lines · Nicolas Dichtel
Quoted 63 lines · Daniel Borkmann
In order to facilitate development for netlink protocol dissector, fill the unused field
skb->pkt_typeof the cloned skb with a hint of the address space of the new owner (receiver) socket in the notion of "to kernel" resp. "to user".At the time we invoke
__netlink_deliver_tap_skb(), we already have set the new skb owner vianetlink_skb_set_owner_r(), so we can use that fornetlink_is_kernel()probing.In normal
PF_PACKETnetwork traffic, this field denotes if the packet is destined for us (PACKET_HOST), if it's broadcast (PACKET_BROADCAST), etc.As we only have 3 bit reserved, we can use the value (= 6) of
PACKET_FASTROUTEas it's_notused_anywhere in the whole kernel and not supported anywhere, and packets of such type were never exposed to user space, so there are no overlapping users of such kind. Thus, as wished, that seems the only way to make both PACKET_* values non-overlapping and therefore device agnostic.By using those two flags for netlink skbs on nlmon devices, they can be made available and picked up via
sll_pkttype(previously unused in netlink context) in structsockaddr_ll. We now have these two directions:- PACKET_USER (= 6) -> to user space - PACKET_KERNEL (= 7) -> to kernel spacePartial
ip aexample strace for sa_family=AF_NETLINK with detected nl msg direction:syscall: direction: sendto(3, ...) = 40 /* to kernel */ recvmsg(3, ...) = 3404 /* to user */ recvmsg(3, ...) = 1120 /* to user */ recvmsg(3, ...) = 20 /* to user */ sendto(3, ...) = 40 /* to kernel */ recvmsg(3, ...) = 168 /* to user */ recvmsg(3, ...) = 144 /* to user */ recvmsg(3, ...) = 20 /* to user */Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Jakub Zawadzki <[email protected]>---
v1->v2:
- let PACKET_* values not overlap as requested by Dave
v2->v3:
- fixed typo in comment spotted by Nicolas, thanksinclude/uapi/linux/if_packet.h | 4 +++- net/netlink/af_netlink.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)include/uapi/linux/if_packet.h +0
-1@@ -26,8 +26,10 @@ struct sockaddr_ll {#define PACKET_MULTICAST 2/* To group */ #define PACKET_OTHERHOST 3/* To someone else */ #define PACKET_OUTGOING 4/* Outgoing of any type */ -/* These ones are invisible by user level */ #define PACKET_LOOPBACK 5/* MC/BRD frame looped back */
Quoted 8 lines
include/uapi/linux/if_packet.h struct sockaddr_ll { · line 33
Quoted 4 lines
include/uapi/linux/if_packet.h +3
-0+#define PACKET_USER 6/* To user space */ +#define PACKET_KERNEL 7/* To kernel space */ +/* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */ #define PACKET_FASTROUTE 6/* Fastrouted frame */ Sorry to insist, I just try to understand. Why not removing the definition of
PACKET_FASTROUTE?
Or have a name likePACKET_NL_USERto document the difference between both cases?
It's now used by nl, but as we have purely generic names, I simply wanted to comply with that.
We could entirely remove it as it was e.g. proposed in 2008 [1] already if you see any value in that. Eventually it's up to Dave and if he likes, I'll be happy to send a patch that removes this define.
Best,
Daniel
David Miller
maintainerRe: [PATCH net-next v3 2/2] netlink: specify netlink packet direction for nlmon
From: Daniel Borkmann <[email protected]>
Date: Mon, 23 Dec 2013 18:54:31 +0100
Quoted 3 lines
We could entirely remove it as it was e.g. proposed in 2008 [1] already if you see any value in that. Eventually it's up to Dave and if he likes, I'll be happy to send a patch that removes this define.
Removing user visible defines can break source builds, for example someone building string tables or auto-generating things to facilitate accessing these values from languages other than C.
It's harmless, since nobody semantically expects anything of it, but we have to keep it around.
Re: [PATCH net-next v3 2/2] netlink: specify netlink packet direction for nlmon
Quoted 7 lines · David Miller
From: Daniel Borkmann <[email protected]>
Date: Mon, 23 Dec 2013 18:54:31 +0100Quoted 3 lines
We could entirely remove it as it was e.g. proposed in 2008 [1] already if you see any value in that. Eventually it's up to Dave and if he likes, I'll be happy to send a patch that removes this define.
Quoted 6 lines
Removing user visible defines can break source builds, for example someone building string tables or auto-generating things to facilitate accessing these values from languages other than C.
It's harmless, since nobody semantically expects anything of it, but we have to keep it around.
Ok, that's fine by me.
Thanks for applying Dave and a happy new year!
Best,
Daniel
David Miller
maintainerFrom: Daniel Borkmann <[email protected]>
Date: Mon, 23 Dec 2013 14:35:54 +0100
Quoted 3 lines
Daniel Borkmann (2):
netlink: only do not deliver to tap when both sides are kernel sks
netlink: specify netlink packet direction for nlmon
Series applied, thanks.