netfilter: bridge: ebt_redirect: don't assume bridge port exists
Subsystems (3)
Florian Westphal
maintainerPATCH 1/1 netfilter: bridge: ebt_redirect: don't assume bridge port exists
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.
--- net/bridge/netfilter/ebt_redirect.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
net/bridge/netfilter/ebt_redirect.c +15 -6
@@ -20,16 +20,25 @@ static unsigned int ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par) { const struct ebt_redirect_info *info = par->targinfo; +const unsigned char *dev_addr;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 -ether_addr_copy (eth_hdr (skb)->h_dest,xt_in (par)->dev_addr); +if (xt_hooknum (par) !=NF_BR_BROUTING ) { +const struct net_bridge_port *port; + + port =br_port_get_rcu (xt_in (par)); +if (!port) +return EBT_DROP ; + + dev_addr = port->br->dev->dev_addr; + }else { + dev_addr =xt_in (par)->dev_addr; + } + +ether_addr_copy (eth_hdr (skb)->h_dest, dev_addr); + skb->pkt_type =PACKET_HOST ;return info->target; }
Signature · 1 line
2.54.0
Pablo Neira Ayuso
maintainerHi Florian,
Quoted 4 lines · Florian Westphal
ebt_redirect_tg()dereferencesbr_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.
Maybe more candidates for the same pattern?
net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/netfilter/nfnetlink_log.c: htonl(br_port_get_rcu(indev)->br->dev->ifindex))) net/netfilter/nfnetlink_log.c: htonl(br_port_get_rcu(outdev)->br->dev->ifindex))) net/netfilter/nfnetlink_queue.c: htonl(br_port_get_rcu(indev)->br->dev->ifindex))) net/netfilter/nfnetlink_queue.c: htonl(br_port_get_rcu(outdev)->br->dev->ifindex)))
So this can be fix in one patch?
Thanks
Quoted 47 lines
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Reported-by Hacking <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- net/bridge/netfilter/ebt_redirect.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)net/bridge/netfilter/ebt_redirect.c +15
-6@@ -20,16 +20,25 @@ static unsigned int ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par) { const struct ebt_redirect_info *info = par->targinfo; +const unsigned char *dev_addr;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 -ether_addr_copy (eth_hdr (skb)->h_dest,xt_in (par)->dev_addr); +if (xt_hooknum (par) !=NF_BR_BROUTING ) { +const struct net_bridge_port *port; + + port =br_port_get_rcu (xt_in (par)); +if (!port) +return EBT_DROP ; + + dev_addr = port->br->dev->dev_addr; + }else { + dev_addr =xt_in (par)->dev_addr; + } + +ether_addr_copy (eth_hdr (skb)->h_dest, dev_addr); + skb->pkt_type =PACKET_HOST ;return info->target; }Signature · 1 line
2.54.0
Florian Westphal
maintainerQuoted 9 lines · Pablo Neira Ayuso
Hi Florian,
Quoted 4 lines · Florian Westphal
ebt_redirect_tg()dereferencesbr_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.Maybe more candidates for the same pattern?
Did not find any, but I only searched in net/bridge/netfilter.
Will send a v2.
Quoted 4 lines
net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true); net/bridge/netfilter/nft_reject_bridge.c: br_forward(br_port_get_rcu(dev), nskb, false, true);
br_forward(NULL, .. is safe.
Quoted 4 lines
net/netfilter/nfnetlink_log.c: htonl(br_port_get_rcu(indev)->br->dev->ifindex))) net/netfilter/nfnetlink_log.c: htonl(br_port_get_rcu(outdev)->br->dev->ifindex))) net/netfilter/nfnetlink_queue.c: htonl(br_port_get_rcu(indev)->br->dev->ifindex))) net/netfilter/nfnetlink_queue.c: htonl(br_port_get_rcu(outdev)->br->dev->ifindex)))
Those aren't.