Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c36b48b authored by Bob Hockney's avatar Bob Hockney Committed by Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_log: fix mac address for 6in4 tunnels 



For tunnelled ipv6in4 packets, the LOG target (xt_LOG.c) adjusts
the start of the mac field to start at the ethernet header instead
of the ipv4 header for the tunnel. This patch conforms what is
passed by the NFLOG target through nfnetlink to what the LOG target
does. Code borrowed from xt_LOG.c.

Signed-off-by: default avatarBob Hockney <bhockney@ix.netcom.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 97cf00e9

net/netfilter/nfnetlink_log.c

+12 −3
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ __build_packet_message(struct nfulnl_instance *inst, 
	struct nfgenmsg *nfmsg;

	sk_buff_data_t old_tail = inst->skb->tail;

	struct sock *sk;

	const unsigned char *hwhdrp;



	nlh = nlmsg_put(inst->skb, 0, 0,

			NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET,
@@ -485,9 +486,17 @@ __build_packet_message(struct nfulnl_instance *inst, 
	if (indev && skb_mac_header_was_set(skb)) {

		if (nla_put_be16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) ||

		    nla_put_be16(inst->skb, NFULA_HWLEN,

				 htons(skb->dev->hard_header_len)) ||

		    nla_put(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len,

			    skb_mac_header(skb)))

				 htons(skb->dev->hard_header_len)))

			goto nla_put_failure;



		hwhdrp = skb_mac_header(skb);



		if (skb->dev->type == ARPHRD_SIT)

			hwhdrp -= ETH_HLEN;



		if (hwhdrp >= skb->head &&

		    nla_put(inst->skb, NFULA_HWHEADER,

			    skb->dev->hard_header_len, hwhdrp))

			goto nla_put_failure;

	}