diff mbox

[ovs-dev,5/5,v2] datapath-windows: fix return value in conntrack

Message ID 20161027185732.11524-1-aserdean@cloudbasesolutions.com
State Superseded
Delegated to: Guru Shetty
Headers show

Commit Message

Alin Serdean Oct. 27, 2016, 6:57 p.m. UTC
'status' is of type 'NTSTATUS' and NlFillOvsMsgForNfGenMsg is of type bool.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 datapath-windows/ovsext/Conntrack.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Sairam Venugopal Oct. 27, 2016, 8:45 p.m. UTC | #1
Acked-by: Sairam Venugopal <vsairam@vmware.com>


On 10/27/16, 11:57 AM, "Alin Serdean" <aserdean@cloudbasesolutions.com>
wrote:

>'status' is of type 'NTSTATUS' and NlFillOvsMsgForNfGenMsg is of type
>bool.
>
>Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
>---
> datapath-windows/ovsext/Conntrack.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
>diff --git a/datapath-windows/ovsext/Conntrack.c
>b/datapath-windows/ovsext/Conntrack.c
>index 74fb38c..d81ef13 100644
>--- a/datapath-windows/ovsext/Conntrack.c
>+++ b/datapath-windows/ovsext/Conntrack.c
>@@ -744,12 +744,14 @@ OvsCtDeleteCmdHandler(POVS_USER_PARAMS_CONTEXT
>usrParamsCtx,
>         NlBufInit(&nlBuf,
>                   usrParamsCtx->outputBuffer,
>                   usrParamsCtx->outputLength);
>-        status = NlFillOvsMsgForNfGenMsg(&nlBuf, nlmsgType, NLM_F_CREATE,
>-                                         msgIn->nlMsg.nlmsgSeq,
>-                                         msgIn->nlMsg.nlmsgPid,
>-                                         AF_UNSPEC,
>-                                         msgIn->nfGenMsg.version,
>-                                         0);
>+        if (!NlFillOvsMsgForNfGenMsg(&nlBuf, nlmsgType, NLM_F_CREATE,
>+                                     msgIn->nlMsg.nlmsgSeq,
>+                                     msgIn->nlMsg.nlmsgPid,
>+                                     AF_UNSPEC,
>+                                     msgIn->nfGenMsg.version,
>+                                     0)) {
>+            status = STATUS_INVALID_PARAMETER;
>+        }
>         nlMsg = (PNL_MSG_HDR)NlBufAt(&nlBuf, 0, 0);
>         nlMsg->nlmsgLen = NlBufSize(&nlBuf);
>         *replyLen = msgOut->nlMsg.nlmsgLen;
>-- 
>2.9.2.windows.1
>_______________________________________________
>dev mailing list
>dev@openvswitch.org
>https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma
>n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=Dc
>ruz40PROJ40ROzSpxyQSLw6fcrOWpJgEcEmNR3JEQ&m=1Y2zDajaljmsOhZZfX-BX6qooMBLZs
>9FryoNHjBA2gU&s=H8Etjk7iamWO8ZH7cbxYoSJVlPp_XmIIqSCMz1_yTnQ&e=
diff mbox

Patch

diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c
index 74fb38c..d81ef13 100644
--- a/datapath-windows/ovsext/Conntrack.c
+++ b/datapath-windows/ovsext/Conntrack.c
@@ -744,12 +744,14 @@  OvsCtDeleteCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
         NlBufInit(&nlBuf,
                   usrParamsCtx->outputBuffer,
                   usrParamsCtx->outputLength);
-        status = NlFillOvsMsgForNfGenMsg(&nlBuf, nlmsgType, NLM_F_CREATE,
-                                         msgIn->nlMsg.nlmsgSeq,
-                                         msgIn->nlMsg.nlmsgPid,
-                                         AF_UNSPEC,
-                                         msgIn->nfGenMsg.version,
-                                         0);
+        if (!NlFillOvsMsgForNfGenMsg(&nlBuf, nlmsgType, NLM_F_CREATE,
+                                     msgIn->nlMsg.nlmsgSeq,
+                                     msgIn->nlMsg.nlmsgPid,
+                                     AF_UNSPEC,
+                                     msgIn->nfGenMsg.version,
+                                     0)) {
+            status = STATUS_INVALID_PARAMETER;
+        }
         nlMsg = (PNL_MSG_HDR)NlBufAt(&nlBuf, 0, 0);
         nlMsg->nlmsgLen = NlBufSize(&nlBuf);
         *replyLen = msgOut->nlMsg.nlmsgLen;