浏览代码

netfilter: bridge: fix NULL deref in physin/out ifindex helpers

Might not have an outdev yet. We'll oops when iface goes down while skbs
are still nfqueue'd:

RIP: 0010:[<ffffffff81422a2f>]  [<ffffffff81422a2f>] dev_cmp+0x4f/0x80
nfqnl_rcv_dev_event+0xe2/0x150
notifier_call_chain+0x53/0xa0

Fixes: c737b7c4510026 ("netfilter: bridge: add helpers for fetching physin/outdev")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Florian Westphal 10 年之前
父节点
当前提交
547c4b547e
共有 1 个文件被更改,包括 14 次插入2 次删除
  1. 14 2
      include/linux/netfilter_bridge.h

+ 14 - 2
include/linux/netfilter_bridge.h

@@ -39,12 +39,24 @@ static inline void br_drop_fake_rtable(struct sk_buff *skb)
 
 
 static inline int nf_bridge_get_physinif(const struct sk_buff *skb)
 static inline int nf_bridge_get_physinif(const struct sk_buff *skb)
 {
 {
-	return skb->nf_bridge ? skb->nf_bridge->physindev->ifindex : 0;
+	struct nf_bridge_info *nf_bridge;
+
+	if (skb->nf_bridge == NULL)
+		return 0;
+
+	nf_bridge = skb->nf_bridge;
+	return nf_bridge->physindev ? nf_bridge->physindev->ifindex : 0;
 }
 }
 
 
 static inline int nf_bridge_get_physoutif(const struct sk_buff *skb)
 static inline int nf_bridge_get_physoutif(const struct sk_buff *skb)
 {
 {
-	return skb->nf_bridge ? skb->nf_bridge->physoutdev->ifindex : 0;
+	struct nf_bridge_info *nf_bridge;
+
+	if (skb->nf_bridge == NULL)
+		return 0;
+
+	nf_bridge = skb->nf_bridge;
+	return nf_bridge->physoutdev ? nf_bridge->physoutdev->ifindex : 0;
 }
 }
 
 
 static inline struct net_device *
 static inline struct net_device *