diff mbox

[ovs-dev,1/3] datapath-windows: Remove Strsafe usage from datapath

Message ID 20170523175858.524-1-aserdean@cloudbasesolutions.com
State Accepted
Headers show

Commit Message

Alin Serdean May 23, 2017, 5:59 p.m. UTC
The removal is mandatory to use the VStudio 2013 static code analyzer.

The only function that was used from the include is: 'StringCbLengthA'.
We were not checking the result of that function, nor will the
'vportGet->name' exceed the 'OVS_MAX_PORT_NAME_LENGTH' limitation.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 datapath-windows/ovsext/Netlink/NetlinkBuf.c | 1 -
 datapath-windows/ovsext/Vport.c              | 2 --
 datapath-windows/ovsext/precomp.h            | 1 -
 3 files changed, 4 deletions(-)

Comments

Anand Kumar May 24, 2017, 6:34 p.m. UTC | #1
Thank you for the patches. 

Acked-By: Anand Kumar <kumaranand@vmware.com>

Thanks,
Anand Kumar

On 5/23/17, 10:59 AM, "ovs-dev-bounces@openvswitch.org on behalf of Alin Serdean" <ovs-dev-bounces@openvswitch.org on behalf of aserdean@cloudbasesolutions.com> wrote:

    The removal is mandatory to use the VStudio 2013 static code analyzer.
    
    The only function that was used from the include is: 'StringCbLengthA'.
    We were not checking the result of that function, nor will the
    'vportGet->name' exceed the 'OVS_MAX_PORT_NAME_LENGTH' limitation.
    
    Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
    ---
     datapath-windows/ovsext/Netlink/NetlinkBuf.c | 1 -
     datapath-windows/ovsext/Vport.c              | 2 --
     datapath-windows/ovsext/precomp.h            | 1 -
     3 files changed, 4 deletions(-)
    
    diff --git a/datapath-windows/ovsext/Netlink/NetlinkBuf.c b/datapath-windows/ovsext/Netlink/NetlinkBuf.c
    index 0177e88..639b6e5 100644
    --- a/datapath-windows/ovsext/Netlink/NetlinkBuf.c
    +++ b/datapath-windows/ovsext/Netlink/NetlinkBuf.c
    @@ -40,7 +40,6 @@
     #include <intsafe.h>
     #include <ntintsafe.h>
     #include <ntstrsafe.h>
    -#include <Strsafe.h>
     
     #ifdef OVS_DBG_MOD
     #undef OVS_DBG_MOD
    diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c
    index 9142937..075f419 100644
    --- a/datapath-windows/ovsext/Vport.c
    +++ b/datapath-windows/ovsext/Vport.c
    @@ -1618,7 +1618,6 @@ OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet,
                        POVS_VPORT_EXT_INFO extInfo)
     {
         POVS_VPORT_ENTRY vport;
    -    size_t len;
         LOCK_STATE_EX lockState;
         NTSTATUS status = STATUS_SUCCESS;
         BOOLEAN doConvert = FALSE;
    @@ -1626,7 +1625,6 @@ OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet,
         RtlZeroMemory(extInfo, sizeof (POVS_VPORT_EXT_INFO));
         NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, &lockState, 0);
         if (vportGet->portNo == 0) {
    -        StringCbLengthA(vportGet->name, OVS_MAX_PORT_NAME_LENGTH - 1, &len);
             vport = OvsFindVportByHvNameA(gOvsSwitchContext, vportGet->name);
             if (vport == NULL) {
                 /* If the port is not a Hyper-V port and it has been added earlier,
    diff --git a/datapath-windows/ovsext/precomp.h b/datapath-windows/ovsext/precomp.h
    index a152582..14f6843 100644
    --- a/datapath-windows/ovsext/precomp.h
    +++ b/datapath-windows/ovsext/precomp.h
    @@ -19,7 +19,6 @@
     #include <intsafe.h>
     #include <ntintsafe.h>
     #include <ntstrsafe.h>
    -#include <Strsafe.h>
     
     #include "Types.h"
     
    -- 
    2.10.2.windows.1
    _______________________________________________
    dev mailing list
    dev@openvswitch.org
    https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Q5z9tBe-nAOpE7LIHSPV8uy5-437agMXvkeHHMkR8Us&m=hnbloidZq_-2jC6QHp-gxe52OPbKpwBu_w_IsPD3CxM&s=g_Cho8SGUoYXmTkK_TGepW1UCqUjdXvlPJ4mXfujVx8&e=
diff mbox

Patch

diff --git a/datapath-windows/ovsext/Netlink/NetlinkBuf.c b/datapath-windows/ovsext/Netlink/NetlinkBuf.c
index 0177e88..639b6e5 100644
--- a/datapath-windows/ovsext/Netlink/NetlinkBuf.c
+++ b/datapath-windows/ovsext/Netlink/NetlinkBuf.c
@@ -40,7 +40,6 @@ 
 #include <intsafe.h>
 #include <ntintsafe.h>
 #include <ntstrsafe.h>
-#include <Strsafe.h>
 
 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c
index 9142937..075f419 100644
--- a/datapath-windows/ovsext/Vport.c
+++ b/datapath-windows/ovsext/Vport.c
@@ -1618,7 +1618,6 @@  OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet,
                    POVS_VPORT_EXT_INFO extInfo)
 {
     POVS_VPORT_ENTRY vport;
-    size_t len;
     LOCK_STATE_EX lockState;
     NTSTATUS status = STATUS_SUCCESS;
     BOOLEAN doConvert = FALSE;
@@ -1626,7 +1625,6 @@  OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet,
     RtlZeroMemory(extInfo, sizeof (POVS_VPORT_EXT_INFO));
     NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, &lockState, 0);
     if (vportGet->portNo == 0) {
-        StringCbLengthA(vportGet->name, OVS_MAX_PORT_NAME_LENGTH - 1, &len);
         vport = OvsFindVportByHvNameA(gOvsSwitchContext, vportGet->name);
         if (vport == NULL) {
             /* If the port is not a Hyper-V port and it has been added earlier,
diff --git a/datapath-windows/ovsext/precomp.h b/datapath-windows/ovsext/precomp.h
index a152582..14f6843 100644
--- a/datapath-windows/ovsext/precomp.h
+++ b/datapath-windows/ovsext/precomp.h
@@ -19,7 +19,6 @@ 
 #include <intsafe.h>
 #include <ntintsafe.h>
 #include <ntstrsafe.h>
-#include <Strsafe.h>
 
 #include "Types.h"