[PATCH net-next 0/1] net/smc: fix 2020-09-17

[PATCH net-next 0/1] net/smc: fix 2020-09-17

[Karsten Graul]

Please apply the following patch for smc to netdev's net-next tree.

The patch fixes a problem reported by Dan. Because the fixed patch is
still only in net-next tree I am sending this fix to net-next.

Ursula Braun (1):
  net/smc: fix double kfree in smc_listen_work()

 net/smc/af_smc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.17.1

[PATCH net-next 1/1] net/smc: fix double kfree in smc_listen_work()

[Karsten Graul]

From: Ursula Braun <ubraun@linux.ibm.com>

If smc_listen_rmda_finish() returns with an error, the storage
addressed by 'buf' is freed a second time.
Consolidate freeing under a common label and jump to that label.

Fixes: 6bb14e48ee8d ("net/smc: dynamic allocation of CLC proposal buffer")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
---
 net/smc/af_smc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index f5bececfedaa..ed8f97166be9 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1371,7 +1371,6 @@ static void smc_listen_work(struct work_struct *work)
 	}
 
 	/* finish worker */
-	kfree(buf);
 	if (!ism_supported) {
 		rc = smc_listen_rdma_finish(new_smc, &cclc,
 					    ini.first_contact_local);
@@ -1381,12 +1380,13 @@ static void smc_listen_work(struct work_struct *work)
 	}
 	smc_conn_save_peer_info(new_smc, &cclc);
 	smc_listen_out_connected(new_smc);
-	return;
+	goto out_free;
 
 out_unlock:
 	mutex_unlock(&smc_server_lgr_pending);
 out_decl:
 	smc_listen_decline(new_smc, rc, ini.first_contact_local);
+out_free:
 	kfree(buf);
 }
 
-- 
2.17.1

Re: [PATCH net-next 1/1] net/smc: fix double kfree in smc_listen_work()

[David Miller]

From: Karsten Graul <kgraul@linux.ibm.com>
Date: Thu, 17 Sep 2020 22:46:02 +0200

> From: Ursula Braun <ubraun@linux.ibm.com>
> 
> If smc_listen_rmda_finish() returns with an error, the storage
> addressed by 'buf' is freed a second time.
> Consolidate freeing under a common label and jump to that label.
> 
> Fixes: 6bb14e48ee8d ("net/smc: dynamic allocation of CLC proposal buffer")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
> Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>

Applied.