diff options
author | Ido Schimmel <[email protected]> | 2016-07-22 14:56:20 +0300 |
---|---|---|
committer | David S. Miller <[email protected]> | 2016-07-25 10:53:34 -0700 |
commit | baedbe55884c003819f5c8c063ec3d2569414296 (patch) | |
tree | 0778408bcb11dd58c0cfd6588a9da2b6bc0d8bc8 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | 9b97420228881e839b76c8a4506da3cb187bf004 (diff) |
bridge: Fix incorrect re-injection of LLDP packets
Commit 8626c56c8279 ("bridge: fix potential use-after-free when hook
returns QUEUE or STOLEN verdict") caused LLDP packets arriving through a
bridge port to be re-injected to the Rx path with skb->dev set to the
bridge device, but this breaks the lldpad daemon.
The lldpad daemon opens a packet socket with protocol set to ETH_P_LLDP
for any valid device on the system, which doesn't not include soft
devices such as bridge and VLAN.
Since packet sockets (ptype_base) are processed in the Rx path after the
Rx handler, LLDP packets with skb->dev set to the bridge device never
reach the lldpad daemon.
Fix this by making the bridge's Rx handler re-inject LLDP packets with
RX_HANDLER_PASS, which effectively restores the behaviour prior to the
mentioned commit.
This means netfilter will never receive LLDP packets coming through a
bridge port, as I don't see a way in which we can have okfn() consume
the packet without breaking existing behaviour. I've already carried out
a similar fix for STP packets in commit 56fae404fb2c ("bridge: Fix
incorrect re-injection of STP packets").
Fixes: 8626c56c8279 ("bridge: fix potential use-after-free when hook returns QUEUE or STOLEN verdict")
Signed-off-by: Ido Schimmel <[email protected]>
Reviewed-by: Jiri Pirko <[email protected]>
Cc: Florian Westphal <[email protected]>
Cc: John Fastabend <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions