From 3bfe44a47d510980f8da4c81a8b6cf17d9dfeaf3 Mon Sep 17 00:00:00 2001 From: Nithin Raju Date: Thu, 30 Oct 2014 13:17:43 -0700 Subject: datapath-windows: Don't leak NBLs with multiple NBs. Currently, if we receive an NBL with multiple NBs from NDIS, we just ASSERT() and not do anything. The right thing to do obviously is to process the NBL. This is a work in progress. In the meantime, we should complete the NBL and not just leak it. Signed-off-by: Nithin Raju Acked-by: Eitan Eliahu Tested-by: Alin Gabriel Serdean Acked-by: Alin Gabriel Serdean Signed-off-by: Ben Pfaff --- datapath-windows/ovsext/PacketIO.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'datapath-windows/ovsext/PacketIO.c') diff --git a/datapath-windows/ovsext/PacketIO.c b/datapath-windows/ovsext/PacketIO.c index 52231259e..1af391b42 100644 --- a/datapath-windows/ovsext/PacketIO.c +++ b/datapath-windows/ovsext/PacketIO.c @@ -218,7 +218,12 @@ OvsStartNBLIngress(POVS_SWITCH_CONTEXT switchContext, curNb = NET_BUFFER_LIST_FIRST_NB(curNbl); if (curNb->Next != NULL) { /* XXX: This case is not handled yet. */ - ASSERT(FALSE); + RtlInitUnicodeString(&filterReason, + L"Dropping NBLs with multiple NBs"); + OvsStartNBLIngressError(switchContext, curNbl, + sendCompleteFlags, &filterReason, + NDIS_STATUS_RESOURCES); + continue; } else { POVS_BUFFER_CONTEXT ctx; OvsFlow *flow; -- cgit v1.2.1