Commit 522ee51e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-smc-fixes-2020-10-23' 

Karsten Graul says:

====================
net/smc: fixes 2020-10-23

Patch 1 fixes a potential null pointer dereference. Patch 2 takes care
of a suppressed return code and patch 3 corrects the system EID in the
ISM driver.
====================

Link: https://lore.kernel.org/r/20201023184830.59548-1-kgraul@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents af545bb5 1dc0d1cf

drivers/s390/net/ism_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int ism_move(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx, 
}



static struct ism_systemeid SYSTEM_EID = {

	.seid_string = "IBM-SYSZ-IBMSEID00000000",

	.seid_string = "IBM-SYSZ-ISMSEID00000000",

	.serial_number = "0000",

	.type = "0000",

};

net/smc/af_smc.c

+4 −3
Original line number Diff line number Diff line
@@ -1317,10 +1317,10 @@ static void smc_listen_out_err(struct smc_sock *new_smc) 


/* listen worker: decline and fall back if possible */

static void smc_listen_decline(struct smc_sock *new_smc, int reason_code,

			       struct smc_init_info *ini, u8 version)

			       int local_first, u8 version)

{

	/* RDMA setup failed, switch back to TCP */

	if (ini->first_contact_local)

	if (local_first)

		smc_lgr_cleanup_early(&new_smc->conn);

	else

		smc_conn_free(&new_smc->conn);
@@ -1768,7 +1768,8 @@ static void smc_listen_work(struct work_struct *work) 
out_unlock:

	mutex_unlock(&smc_server_lgr_pending);

out_decl:

	smc_listen_decline(new_smc, rc, ini, version);

	smc_listen_decline(new_smc, rc, ini ? ini->first_contact_local : 0,

			   version);

out_free:

	kfree(ini);

	kfree(buf);

net/smc/smc_core.c

+5 −2
Original line number Diff line number Diff line
@@ -1615,8 +1615,11 @@ static struct smc_buf_desc *smcd_new_buf_create(struct smc_link_group *lgr, 
		rc = smc_ism_register_dmb(lgr, bufsize, buf_desc);

		if (rc) {

			kfree(buf_desc);

			return (rc == -ENOMEM) ? ERR_PTR(-EAGAIN) :

						 ERR_PTR(-EIO);

			if (rc == -ENOMEM)

				return ERR_PTR(-EAGAIN);

			if (rc == -ENOSPC)

				return ERR_PTR(-ENOSPC);

			return ERR_PTR(-EIO);

		}

		buf_desc->pages = virt_to_page(buf_desc->cpu_addr);

		/* CDC header stored in buf. So, pretend it was smaller */