netfilter: nf_queue: reinject must revalidate bridge ports
Subsystems (3)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_queue: reinject must revalidate bridge ports
ebt_redirect_tg() dereferences br_port_get_rcu() return without a NULL check, causing a kernel panic when the bridge port has been removed between the original hook invocation and an NFQUEUE reinject.
A mere NULL check isn't sufficient, however. As sashiko review points out userspace can not only remove the port from the bridge, it could also place the device in a different virtual device, e.g. macvlan.
If this happens, we must drop the packet, there is no way for us to reinject it into the bridge path.
Switch to _upper API, we don't need the bridge port structure. Also, this fix keeps another bug intact:
Both nfnetlink_log and nfnetlink_queue use CONFIG_BRIDGE_NETFILTER too aggressive, which prevents certain logging features when queueing in bridge family: NETFILTER_FAMILY_BRIDGE can be enabled while the old CONFIG_BRIDGE_NETFILTER cruft is off.
Fixes tag is a common ancestor, this was always broken.
--- net/bridge/netfilter/ebt_dnat.c | 4 +- net/bridge/netfilter/ebt_redirect.c | 16 +++++--- net/netfilter/nfnetlink_log.c | 23 +++++++++-- net/netfilter/nfnetlink_queue.c | 64 +++++++++++++++++++++++++---- 4 files changed, 89 insertions(+), 18 deletions(-)
net/bridge/netfilter/ebt_dnat.c +3 -1
@@ -39,7 +39,9 @@ ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par) dev =xt_in (par);break ;case NF_BR_PRE_ROUTING : - dev =br_port_get_rcu (xt_in (par))->br->dev; + dev =netdev_master_upper_dev_get_rcu (xt_in (par)); +if (!dev)/* bridge port removed? */ +return EBT_DROP ;break ;default : dev =NULL ;
net/bridge/netfilter/ebt_redirect.c +11 -5
@@ -24,12 +24,18 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par)if (skb_ensure_writable (skb,0 ))return EBT_DROP ; -if (xt_hooknum (par) !=NF_BR_BROUTING ) -/* rcu_read_lock()ed by nf_hook_thresh */ -ether_addr_copy (eth_hdr (skb)->h_dest, -br_port_get_rcu (xt_in (par))->br->dev->dev_addr); -else +if (xt_hooknum (par) !=NF_BR_BROUTING ) { +const struct net_device *dev; + + dev =netdev_master_upper_dev_get_rcu (xt_in (par)); +if (!dev) +return EBT_DROP ; + +ether_addr_copy (eth_hdr (skb)->h_dest, dev->dev_addr); + }else {ether_addr_copy (eth_hdr (skb)->h_dest,xt_in (par)->dev_addr); + } + skb->pkt_type =PACKET_HOST ;return info->target; }
net/netfilter/nfnetlink_log.c +19 -4
@@ -451,6 +451,23 @@ static int nfulnl_put_bridge(struct nfulnl_instance *inst, const struct sk_buffreturn -1 ; } +#if IS_ENABLED (CONFIG_BRIDGE_NETFILTER ) +static int nflog_put_master_ifindex (struct sk_buff *nlskb,int attr, +const struct net_device *dev) +{ +const struct net_device *upper; + +if (dev && !netif_is_bridge_port (dev)) +return 0 ; + + upper =netdev_master_upper_dev_get_rcu ((struct net_device *)dev); +if (upper &&nla_put_be32 (nlskb, attr,htonl (upper->ifindex))) +return -EMSGSIZE ; + +return 0 ; +} +#endif +/* This is an inline function, we don't really care about a long * list of arguments */ static inline int
@@ -505,8 +522,7 @@ __build_packet_message(struct nfnl_log_net *log,/* rcu_read_lock()ed by nf_hook_thresh or * nf_log_packet. */ - nla_put_be32(inst->skb, NFULA_IFINDEX_INDEV, - htonl(br_port_get_rcu(indev)->br->dev->ifindex))) + nflog_put_master_ifindex(inst->skb, NFULA_IFINDEX_INDEV, indev)) goto nla_put_failure; }else {int physinif;
@@ -542,8 +558,7 @@ __build_packet_message(struct nfnl_log_net *log,/* rcu_read_lock()ed by nf_hook_thresh or * nf_log_packet. */ - nla_put_be32(inst->skb, NFULA_IFINDEX_OUTDEV, - htonl(br_port_get_rcu(outdev)->br->dev->ifindex))) + nflog_put_master_ifindex(inst->skb, NFULA_IFINDEX_OUTDEV, outdev)) goto nla_put_failure; }else {struct net_device *physoutdev;
net/netfilter/nfnetlink_queue.c +56 -8
92 lines not on this page · raw message
Signature · 1 line
2.53.0