summaryrefslogtreecommitdiff
path: root/net/smc
diff options
context:
space:
mode:
authorKarsten Graul <kgraul@linux.ibm.com>2020-10-07 23:57:42 +0300
committerJakub Kicinski <kuba@kernel.org>2020-10-10 04:15:47 +0300
commit9047a617dc2f8ea0575ef80c38e57ed52b712a1f (patch)
treefe753701031987c1339963808b2e264bc97462af /net/smc
parentc60a2cefb32d2f0e88141b942f92d94bd69bb56f (diff)
downloadlinux-9047a617dc2f8ea0575ef80c38e57ed52b712a1f.tar.xz
net/smc: cleanup buffer usage in smc_listen_work()
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>
Diffstat (limited to 'net/smc')
-rw-r--r--net/smc/af_smc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index fbe98bb20299..f481f0ed2b78 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -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)