linux.git/net/bridge, branch v6.8-rc2

netfilter: bridge: replace physindev with physinif in nf_bridge_info

2024-01-17T11:02:49+00:00

An skb can be added to a neigh->arp_queue while waiting for an arp
reply. Where original skb's skb->dev can be different to neigh's
neigh->dev. For instance in case of bridging dnated skb from one veth to
another, the skb would be added to a neigh->arp_queue of the bridge.

As skb->dev can be reset back to nf_bridge->physindev and used, and as
there is no explicit mechanism that prevents this physindev from been
freed under us (for instance neigh_flush_dev doesn't cleanup skbs from
different device's neigh queue) we can crash on e.g. this stack:

arp_process
  neigh_update
    skb = __skb_dequeue(&neigh->arp_queue)
      neigh_resolve_output(..., skb)
        ...
          br_nf_dev_xmit
            br_nf_pre_routing_finish_bridge_slow
              skb->dev = nf_bridge->physindev
              br_handle_frame_finish

Let's use plain ifindex instead of net_device link. To peek into the
original net_device we will use dev_get_by_index_rcu(). Thus either we
get device and are safe to use it or we don't get it and drop skb.

Fixes: c4e70a87d975 ("netfilter: bridge: rename br_netfilter.c to br_netfilter_hooks.c")
Suggested-by: Florian Westphal 
Signed-off-by: Pavel Tikhomirov 
Signed-off-by: Pablo Neira Ayuso

bridge: cfm: fix enum typo in br_cc_ccm_tx_parse

2023-12-26T22:38:13+00:00

It appears that there is a typo in the code where the nlattr array is
being parsed with policy br_cfm_cc_ccm_tx_policy, but the instance is
being accessed via IFLA_BRIDGE_CFM_CC_RDI_INSTANCE, which is associated
with the policy br_cfm_cc_rdi_policy.

This problem was introduced by commit 2be665c3940d ("bridge: cfm: Netlink
SET configuration Interface.").

Though it seems like a harmless typo since these two enum owns the exact
same value (1 here), it is quite misleading hence fix it by using the
correct enum IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE here.

Signed-off-by: Lin Ma 
Reviewed-by: Simon Horman 
Acked-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

bridge: mdb: Add MDB bulk deletion support

2023-12-20T11:27:20+00:00

Implement MDB bulk deletion support in the bridge driver, allowing MDB
entries to be deleted in bulk according to provided parameters.

Signed-off-by: Ido Schimmel 
Reviewed-by: Petr Machata 
Acked-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

docs: bridge: Add kAPI/uAPI fields

2023-12-05T09:48:00+00:00

Add kAPI/uAPI field for bridge doc. Update struct net_bridge_vlan
comments to fix doc build warning.

Reviewed-by: Florian Fainelli 
Signed-off-by: Hangbin Liu 
Acked-by: Nikolay Aleksandrov 
Signed-off-by: Paolo Abeni

netfilter: nf_conntrack_bridge: initialize err to 0

2023-11-14T15:16:21+00:00

K2CI reported a problem:

	consume_skb(skb);
	return err;
[nf_br_ip_fragment() error]  uninitialized symbol 'err'.

err is not initialized, because returning 0 is expected, initialize err
to 0.

Fixes: 3c171f496ef5 ("netfilter: bridge: add connection tracking system")
Reported-by: k2ci 
Signed-off-by: Linkui Xiao 
Signed-off-by: Pablo Neira Ayuso

netfilter: add missing module descriptions

2023-11-08T12:52:32+00:00

W=1 builds warn on missing MODULE_DESCRIPTION, add them.

Signed-off-by: Florian Westphal 
Signed-off-by: Pablo Neira Ayuso

net: bridge: fill in MODULE_DESCRIPTION()

2023-10-27T10:16:44+00:00

Fill in bridge's module description.

Suggested-by: Jakub Kicinski 
Signed-off-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

bridge: mcast: Add MDB get support

2023-10-27T09:51:42+00:00

Implement support for MDB get operation by looking up a matching MDB
entry, allocating the skb according to the entry's size and then filling
in the response. The operation is performed under the bridge multicast
lock to ensure that the entry does not change between the time the reply
size is determined and when the reply is filled in.

Signed-off-by: Ido Schimmel 
Acked-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

bridge: mcast: Rename MDB entry get function

2023-10-27T09:51:41+00:00

The current name is going to conflict with the upcoming net device
operation for the MDB get operation.

Rename the function to br_mdb_entry_skb_get(). No functional changes
intended.

Signed-off-by: Ido Schimmel 
Acked-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

bridge: mcast: Factor out a helper for PG entry size calculation

2023-10-27T09:51:41+00:00

Currently, netlink notifications are sent for individual port group
entries and not for the entire MDB entry itself.

Subsequent patches are going to add MDB get support which will require
the bridge driver to reply with an entire MDB entry.

Therefore, as a preparation, factor out an helper to calculate the size
of an individual port group entry. When determining the size of the
reply this helper will be invoked for each port group entry in the MDB
entry.

No functional changes intended.

Signed-off-by: Ido Schimmel 
Acked-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller