Patchwork [net] netlink: reset network header before passing to taps

login
register
mail settings
Submitter Daniel Borkmann
Date Aug. 7, 2014, 8:22 p.m.
Message ID <1407442967-2109-1-git-send-email-dborkman@redhat.com>
Download mbox | patch
Permalink /patch/377944/
State Accepted
Delegated to: David Miller
Headers show

Comments

Daniel Borkmann - Aug. 7, 2014, 8:22 p.m.
netlink doesn't set any network header offset thus when the skb is
being passed to tap devices via dev_queue_xmit_nit(), it emits klog
false positives due to it being unset like:

  ...
  [  124.990397] protocol 0000 is buggy, dev nlmon0
  [  124.990411] protocol 0000 is buggy, dev nlmon0
  ...

So just reset the network header before passing to the device; for
packet sockets that just means nothing will change - mac and net
offset hold the same value just as before.

Reported-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 net/netlink/af_netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Miller - Aug. 7, 2014, 11:06 p.m.
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu,  7 Aug 2014 22:22:47 +0200

> netlink doesn't set any network header offset thus when the skb is
> being passed to tap devices via dev_queue_xmit_nit(), it emits klog
> false positives due to it being unset like:
> 
>   ...
>   [  124.990397] protocol 0000 is buggy, dev nlmon0
>   [  124.990411] protocol 0000 is buggy, dev nlmon0
>   ...
> 
> So just reset the network header before passing to the device; for
> packet sockets that just means nothing will change - mac and net
> offset hold the same value just as before.
> 
> Reported-by: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

Applied and queued up for -stable.
--
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

Patch

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index a324b4b..2e152e5 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -213,7 +213,7 @@  static int __netlink_deliver_tap_skb(struct sk_buff *skb,
 		nskb->protocol = htons((u16) sk->sk_protocol);
 		nskb->pkt_type = netlink_is_kernel(sk) ?
 				 PACKET_KERNEL : PACKET_USER;
-
+		skb_reset_network_header(nskb);
 		ret = dev_queue_xmit(nskb);
 		if (unlikely(ret > 0))
 			ret = net_xmit_errno(ret);