Commit 94b84e45 authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/csr: Fix dereference before check 



Smatch complains about some pointers that are dereferenced before being
checked:

drivers/staging/csr/sme_sys.c:285
CsrWifiRouterCtrlHipReqHandler() warn: variable dereferenced before
check 'priv' (see line 283)
drivers/staging/csr/sme_sys.c:1503
CsrWifiRouterMaPacketReqHandler() warn: variable dereferenced before
check 'priv' (see line 1501)
drivers/staging/csr/sme_sys.c:2062
CsrWifiRouterCtrlPeerDelReqHandler() warn: variable dereferenced before
check 'priv' (see line 2059)
drivers/staging/csr/sme_sys.c:2477
CsrWifiRouterCtrlPeerAddReqHandler() warn: variable dereferenced before
check 'priv' (see line 2474)
drivers/staging/csr/sme_sys.c:3045
CsrWifiRouterCtrlWapiRxPktReqHandler() warn: variable dereferenced
before check 'priv' (see line 3039)

We put the check before the dereferencing and prevent an oops and fix
the warning.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dbc320f7

drivers/staging/csr/sme_sys.c

+26 −15
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
    CSR_SIGNAL *signal;

    u16 interfaceTag = 0;

    CSR_MA_PACKET_REQUEST *req;

    netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];

    netInterface_priv_t *interfacePriv;



    if (priv == NULL) {

        return;
@@ -294,6 +294,8 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
        return;

    }



    interfacePriv = priv->interfacePriv[interfaceTag];



    /* Initialize bulkdata to avoid os_net_buf is garbage */

    memset(&bulkdata, 0, sizeof(bulk_data_param_t));
@@ -1498,7 +1500,7 @@ void CsrWifiRouterMaPacketReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
    u8 *daddr, *saddr;

    u16 interfaceTag = mareq->interfaceTag & 0x00ff;

    int queue;

    netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];

    netInterface_priv_t *interfacePriv;



    if (!mareq->frame || !priv || !priv->smepriv)

    {
@@ -1510,6 +1512,8 @@ void CsrWifiRouterMaPacketReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
        unifi_error(priv, "CsrWifiRouterMaPacketReqHandler: interfaceID >= CSR_WIFI_NUM_INTERFACES.\n");

        return;

    }



    interfacePriv = priv->interfacePriv[interfaceTag];

    /* get a pointer to dest & source Mac address */

    daddr = mareq->frame;

    saddr = (mareq->frame + ETH_ALEN);
@@ -2056,7 +2060,7 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
    CsrWifiRouterCtrlPeerDelReq* req = (CsrWifiRouterCtrlPeerDelReq*)msg;

    CsrResult status = CSR_RESULT_SUCCESS;

    unifi_priv_t *priv = (unifi_priv_t*)drvpriv;

    netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];

    netInterface_priv_t *interfacePriv;



    unifi_trace(priv, UDBG2, "entering CsrWifiRouterCtrlPeerDelReqHandler\n");

    if (priv == NULL)
@@ -2071,6 +2075,8 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
        return;

    }



    interfacePriv = priv->interfacePriv[req->interfaceTag];



    switch(interfacePriv->interfaceMode)

    {

        case CSR_WIFI_ROUTER_CTRL_MODE_AP:
@@ -2471,7 +2477,7 @@ void CsrWifiRouterCtrlPeerAddReqHandler(void* drvpriv,CsrWifiFsmEvent* msg) 
    CsrResult status = CSR_RESULT_SUCCESS;

    unifi_priv_t *priv = (unifi_priv_t*)drvpriv;

    u32 handle = 0;

    netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];

    netInterface_priv_t *interfacePriv;



    unifi_trace(priv, UDBG2, "entering CsrWifiRouterCtrlPeerAddReqHandler \n");

    if (priv == NULL)
@@ -2486,6 +2492,8 @@ void CsrWifiRouterCtrlPeerAddReqHandler(void* drvpriv,CsrWifiFsmEvent* msg) 
        return;

    }



    interfacePriv = priv->interfacePriv[req->interfaceTag];



    switch(interfacePriv->interfaceMode)

    {

        case CSR_WIFI_ROUTER_CTRL_MODE_AP:
@@ -3036,22 +3044,25 @@ void CsrWifiRouterCtrlWapiRxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) 
    ul_client_t *client;

    CSR_SIGNAL signal;

    CSR_MA_PACKET_INDICATION *pkt_ind;

    netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];



    if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) {



    	unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__);

    netInterface_priv_t *interfacePriv;



    if (priv == NULL) {

            unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq : invalid priv\n",__FUNCTION__);

	    unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq : invalid priv\n", __func__);

	    return;

    }



    if (priv->smepriv == NULL) {

             unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq : invalid sme priv\n",__FUNCTION__);

	    unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq : invalid sme priv\n", __func__);

	    return;

    }



    interfacePriv = priv->interfacePriv[req->interfaceTag];



    if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) {



    	unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__);





        if (req->dataLength == 0 || req->data == NULL) {

             unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq: invalid request\n",__FUNCTION__);

             return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE