summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorLiping Zhang <zlpnobody@gmail.com>2016-11-14 17:39:25 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2016-12-04 22:45:33 +0300
commit673ab46f345557e9d741e97ca0301280360d1af1 (patch)
tree7274e919256ae409a0657306e823df780dff6282 /net/bridge
parentb8ad652f9779976d0300ae199961e413859d5378 (diff)
downloadlinux-673ab46f345557e9d741e97ca0301280360d1af1.tar.xz
netfilter: nf_log: do not assume ethernet header in netdev family
In netdev family, we will handle non ethernet packets, so using eth_hdr(skb)->h_proto is incorrect. Meanwhile, we can use socket(AF_PACKET...) to sending packets, so skb->protocol is not always set in bridge family. Add an extra parameter into nf_log_l2packet to solve this issue. Fixes: 1fddf4bad0ac ("netfilter: nf_log: add packet logging for netdev family") Signed-off-by: Liping Zhang <zlpnobody@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/netfilter/nf_log_bridge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/netfilter/nf_log_bridge.c b/net/bridge/netfilter/nf_log_bridge.c
index c197b1f844ee..bd2b3c78f59b 100644
--- a/net/bridge/netfilter/nf_log_bridge.c
+++ b/net/bridge/netfilter/nf_log_bridge.c
@@ -24,7 +24,8 @@ static void nf_log_bridge_packet(struct net *net, u_int8_t pf,
const struct nf_loginfo *loginfo,
const char *prefix)
{
- nf_log_l2packet(net, pf, hooknum, skb, in, out, loginfo, prefix);
+ nf_log_l2packet(net, pf, eth_hdr(skb)->h_proto, hooknum, skb,
+ in, out, loginfo, prefix);
}
static struct nf_logger nf_bridge_logger __read_mostly = {