Commit 907e51e4 authored Feb 14, 2020 by David S. Miller

Merge branch 'smc-fixes'



Karsten Graul says:

====================
net/smc: fixes for -net

Fix a syzbot finding and a problem with the CLC handshake content.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents dc221a28 369537c9

net/smc/af_smc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -470,6 +470,8 @@ static void smc_switch_to_fallback(struct smc_sock *smc)
		if (smc->sk.sk_socket && smc->sk.sk_socket->file) {
		smc->clcsock->file = smc->sk.sk_socket->file;
		smc->clcsock->file->private_data = smc->clcsock;
		smc->clcsock->wq.fasync_list =
		smc->sk.sk_socket->wq.fasync_list;
		}
		}

net/smc/smc_clc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -372,7 +372,9 @@ int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info)
		dclc.hdr.length = htons(sizeof(struct smc_clc_msg_decline));
		dclc.hdr.version = SMC_CLC_V1;
		dclc.hdr.flag = (peer_diag_info == SMC_CLC_DECL_SYNCERR) ? 1 : 0;
		memcpy(dclc.id_for_peer, local_systemid, sizeof(local_systemid));
		if (smc->conn.lgr && !smc->conn.lgr->is_smcd)
		memcpy(dclc.id_for_peer, local_systemid,
		sizeof(local_systemid));
		dclc.peer_diagnosis = htonl(peer_diag_info);
		memcpy(dclc.trl.eyecatcher, SMC_EYECATCHER, sizeof(SMC_EYECATCHER));