Skip to content

Commit 53fc685

Browse files
idoschdavem330
authored andcommitted
bridge: Avoid infinite loop when suppressing NS messages with invalid options
When neighbor suppression is enabled the bridge device might reply to Neighbor Solicitation (NS) messages on behalf of remote hosts. In case the NS message includes the "Source link-layer address" option [1], the bridge device will use the specified address as the link-layer destination address in its reply. To avoid an infinite loop, break out of the options parsing loop when encountering an option with length zero and disregard the NS message. This is consistent with the IPv6 ndisc code and RFC 4886 which states that "Nodes MUST silently discard an ND packet that contains an option with length zero" [2]. [1] https://tools.ietf.org/html/rfc4861#section-4.3 [2] https://tools.ietf.org/html/rfc4861#section-4.6 Fixes: ed842fa ("bridge: suppress nd pkts on BR_NEIGH_SUPPRESS ports") Signed-off-by: Ido Schimmel <[email protected]> Reported-by: Alla Segal <[email protected]> Tested-by: Alla Segal <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent dafe207 commit 53fc685

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/bridge/br_arp_nd_proxy.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,
276276
ns_olen = request->len - (skb_network_offset(request) +
277277
sizeof(struct ipv6hdr)) - sizeof(*ns);
278278
for (i = 0; i < ns_olen - 1; i += (ns->opt[i + 1] << 3)) {
279+
if (!ns->opt[i + 1]) {
280+
kfree_skb(reply);
281+
return;
282+
}
279283
if (ns->opt[i] == ND_OPT_SOURCE_LL_ADDR) {
280284
daddr = ns->opt + i + sizeof(struct nd_opt_hdr);
281285
break;

0 commit comments

Comments
 (0)