Skip to content

Commit

Permalink
Match dstIP in Classifier to address windows promiscuous mode issue
Browse files Browse the repository at this point in the history
When promiscuous mode is enabled, OVS incorrectly forwards packets destined for
non-local IP addresses from the uplink to the host interface. Due to IP forwarding
being enabled, these packets are re-sent to br-int according to the default route
and are eventually forwarded to the uplink. Since the source MAC of these packets
has been changed to the local host’s MAC, this can potentially cause errors on the switch.

This patch matches dstIP field in ClassifierTable to ensure proper packet handling
and preventing unintended forwarding.

Signed-off-by: Shuyang Xin <gavinx@vmware.com>
  • Loading branch information
XinShuYang committed Jul 31, 2024
1 parent 5cee770 commit fcaeced
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/agent/openflow/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -2969,7 +2969,7 @@ func (f *featurePodConnectivity) hostBridgeLocalFlows() []binding.Flow {
// This generates the flow to forward the packets from uplink port to bridge local port.
ClassifierTable.ofTable.BuildFlow(priorityNormal).
Cookie(cookieID).
MatchInPort(f.uplinkPort).
matchUplinkInPort(f.uplinkPort).

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Build Antrea Windows binaries

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (macos-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (macos-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (macos-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (macos-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Build Antrea and antctl binaries

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Integration test

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (ubuntu-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (ubuntu-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (ubuntu-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Golangci-lint (ubuntu-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort) (typecheck)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Go benchmark test

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Unit test (ubuntu-latest)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / golicense

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Analyze on Linux (go)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Analyze on Windows (go)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)

Check failure on line 2972 in pkg/agent/openflow/pipeline.go

View workflow job for this annotation

GitHub Actions / Unit test (windows-2022)

ClassifierTable.ofTable.BuildFlow(priorityNormal).Cookie(cookieID).matchUplinkInPort undefined (type "antrea.io/antrea/pkg/ovs/openflow".FlowBuilder has no field or method matchUplinkInPort)
Action().Output(f.hostIfacePort).
Done(),
// This generates the flow to forward the packets from bridge local port to uplink port.
Expand Down
4 changes: 4 additions & 0 deletions pkg/agent/openflow/pipeline_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import (
binding "antrea.io/antrea/pkg/ovs/openflow"
)

func (f *featurePodConnectivity) matchUplinkInPort(flowBuilder binding.FlowBuilder) binding.FlowBuilder {
return flowBuilder.MatchInPort(f.uplinkPort)
}

// hostBridgeUplinkFlows generates the flows that forward traffic between the bridge local port and the uplink port to
// support the host traffic.
// TODO(gran): sync latest changes from pipeline_windows.go
Expand Down
5 changes: 5 additions & 0 deletions pkg/agent/openflow/pipeline_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ import (
binding "antrea.io/antrea/pkg/ovs/openflow"
)

// matchUplinkInPort matches dstIP field to prevent unintended forwarding when promiscuous mode is enabled on Windows.
func (f *featurePodConnectivity) matchUplinkInPort(flowBuilder binding.FlowBuilder) binding.FlowBuilder {
return flowBuilder.MatchInPort(f.uplinkPort).MatchProtocol(binding.ProtocolIP).MatchDstIP(f.nodeConfig.NodeTransportIPv4Addr.IP)
}

// hostBridgeUplinkFlows generates the flows that forward traffic between the bridge local port and the uplink port to
// support the host traffic with outside.
func (f *featurePodConnectivity) hostBridgeUplinkFlows() []binding.Flow {
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/openflow/pod_connectivity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func podConnectivityInitFlows(
flows = append(flows,
"cookie=0x1010000000000, table=ARPSpoofGuard, priority=200,in_port=32770 actions=output:4294967294",
"cookie=0x1010000000000, table=ARPSpoofGuard, priority=200,in_port=4294967294 actions=output:32770",
"cookie=0x1010000000000, table=Classifier, priority=200,in_port=32770 actions=output:4294967294",
"cookie=0x1010000000000, table=Classifier, priority=200,ip,in_port=32770,nw_dst=192.168.77.100 actions=output:4294967294",
"cookie=0x1010000000000, table=Classifier, priority=200,in_port=4294967294 actions=output:32770",
"cookie=0x1010000000000, table=IngressSecurityClassifier, priority=210,ct_state=-rpl+trk,ip,nw_src=10.10.0.1 actions=goto_table:ConntrackCommit",
)
Expand Down Expand Up @@ -161,7 +161,7 @@ func podConnectivityInitFlows(
"cookie=0x1010000000000, table=ARPSpoofGuard, priority=200,in_port=32770 actions=output:4294967294",
"cookie=0x1010000000000, table=ARPSpoofGuard, priority=200,in_port=4294967294 actions=output:32770",
"cookie=0x1010000000000, table=Classifier, priority=210,ip,in_port=32770,nw_dst=10.10.0.0/24 actions=set_field:0x4/0xf->reg0,set_field:0x200/0x200->reg0,goto_table:UnSNAT",
"cookie=0x1010000000000, table=Classifier, priority=200,in_port=32770 actions=output:4294967294",
"cookie=0x1010000000000, table=Classifier, priority=200,ip,in_port=32770,nw_dst=192.168.77.100 actions=output:4294967294",
"cookie=0x1010000000000, table=Classifier, priority=200,in_port=4294967294 actions=output:32770",
"cookie=0x1010000000000, table=SpoofGuard, priority=200,ip,in_port=32769 actions=goto_table:UnSNAT",
"cookie=0x1010000000000, table=ConntrackZone, priority=200,ip actions=ct(table=ConntrackState,zone=65520,nat)",
Expand Down

0 comments on commit fcaeced

Please sign in to comment.