OSDN Git Service

net/smc: fix double kfree in smc_listen_work()
authorUrsula Braun <ubraun@linux.ibm.com>
Thu, 17 Sep 2020 20:46:02 +0000 (22:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Sep 2020 01:03:56 +0000 (18:03 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/smc/af_smc.c

index f5becec..ed8f971 100644 (file)
@@ -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);
 }