]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/smc: cleanup buffer usage in smc_listen_work()
authorKarsten Graul <kgraul@linux.ibm.com>
Wed, 7 Oct 2020 20:57:42 +0000 (22:57 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sat, 10 Oct 2020 01:15:47 +0000 (18:15 -0700)
coccinelle informs about
net/smc/af_smc.c:1770:10-11: WARNING: opportunity for kzfree/kvfree_sensitive

Its not that kzfree() would help here, the memset() is done to prepare
the buffer for another socket receive.
Fix that warning message by reordering the calls, while at it eliminate
the unneeded variable cclc2 and use sizeof(*buf) as above in the same
function. No functional changes.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/smc/af_smc.c

index fbe98bb202997278a68fd83e0d0bb6d036456511..f481f0ed2b7804c51069f4bd142f31172e5f1693 100644 (file)
@@ -1664,7 +1664,6 @@ static void smc_listen_work(struct work_struct *work)
                                                smc_listen_work);
        u8 version = smc_ism_v2_capable ? SMC_V2 : SMC_V1;
        struct socket *newclcsock = new_smc->clcsock;
-       struct smc_clc_msg_accept_confirm_v2 *cclc2;
        struct smc_clc_msg_accept_confirm *cclc;
        struct smc_clc_msg_proposal_area *buf;
        struct smc_clc_msg_proposal *pclc;
@@ -1740,11 +1739,9 @@ static void smc_listen_work(struct work_struct *work)
                mutex_unlock(&smc_server_lgr_pending);
 
        /* receive SMC Confirm CLC message */
-       cclc2 = (struct smc_clc_msg_accept_confirm_v2 *)buf;
-       cclc = (struct smc_clc_msg_accept_confirm *)cclc2;
-       memset(buf, 0, sizeof(struct smc_clc_msg_proposal_area));
-       rc = smc_clc_wait_msg(new_smc, cclc2,
-                             sizeof(struct smc_clc_msg_proposal_area),
+       memset(buf, 0, sizeof(*buf));
+       cclc = (struct smc_clc_msg_accept_confirm *)buf;
+       rc = smc_clc_wait_msg(new_smc, cclc, sizeof(*buf),
                              SMC_CLC_CONFIRM, CLC_WAIT_TIME);
        if (rc) {
                if (!ini->is_smcd)