浏览代码

netfilter: call nf_hook_ingress with rcu_read_lock

This commit ensures that the rcu read-side lock is held while the
ingress hook is called.  This ensures that a call to nf_hook_slow (and
ultimately nf_ingress) will be read protected.

Signed-off-by: Aaron Conole <aconole@bytheb.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Aaron Conole 9 年之前
父节点
当前提交
2c1e2703ff
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      net/core/dev.c

+ 6 - 1
net/core/dev.c

@@ -4040,12 +4040,17 @@ static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,
 {
 {
 #ifdef CONFIG_NETFILTER_INGRESS
 #ifdef CONFIG_NETFILTER_INGRESS
 	if (nf_hook_ingress_active(skb)) {
 	if (nf_hook_ingress_active(skb)) {
+		int ingress_retval;
+
 		if (*pt_prev) {
 		if (*pt_prev) {
 			*ret = deliver_skb(skb, *pt_prev, orig_dev);
 			*ret = deliver_skb(skb, *pt_prev, orig_dev);
 			*pt_prev = NULL;
 			*pt_prev = NULL;
 		}
 		}
 
 
-		return nf_hook_ingress(skb);
+		rcu_read_lock();
+		ingress_retval = nf_hook_ingress(skb);
+		rcu_read_unlock();
+		return ingress_retval;
 	}
 	}
 #endif /* CONFIG_NETFILTER_INGRESS */
 #endif /* CONFIG_NETFILTER_INGRESS */
 	return 0;
 	return 0;