Commit a4995684 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Pablo Neira Ayuso

netfilter: bridge: stp fix reference to uninitialized data

The destination mac (destmac) is only valid if EBT_DESTMAC flag
is set. Fix by changing the order of the comparison to look for
the flag first.

Reported-by: syzbot+5c06e318fc558cc27823@syzkaller.appspotmail.com
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2f99aa31
...@@ -161,8 +161,8 @@ static int ebt_stp_mt_check(const struct xt_mtchk_param *par) ...@@ -161,8 +161,8 @@ static int ebt_stp_mt_check(const struct xt_mtchk_param *par)
/* Make sure the match only receives stp frames */ /* Make sure the match only receives stp frames */
if (!par->nft_compat && if (!par->nft_compat &&
(!ether_addr_equal(e->destmac, eth_stp_addr) || (!ether_addr_equal(e->destmac, eth_stp_addr) ||
!is_broadcast_ether_addr(e->destmsk) || !(e->bitmask & EBT_DESTMAC) ||
!(e->bitmask & EBT_DESTMAC))) !is_broadcast_ether_addr(e->destmsk)))
return -EINVAL; return -EINVAL;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment