Commit e87d24fc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-iucv-fixes-2020-11-09' 

Julian Wiedmann says:

====================
net/iucv: fixes 2020-11-09

One fix in the shutdown path for af_iucv sockets. This is relevant for
stable as well.
Also sending along an update for the Maintainers file.

v1 -> v2: use the correct Fixes tag in patch 1 (Jakub)
====================

Link: https://lore.kernel.org/r/20201109075706.56573-1-jwi@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2b52a4b6 4711497a

MAINTAINERS

+0 −3
Original line number Diff line number Diff line
@@ -15246,7 +15246,6 @@ F: drivers/iommu/s390-iommu.c 
S390 IUCV NETWORK LAYER

M:	Julian Wiedmann <jwi@linux.ibm.com>

M:	Karsten Graul <kgraul@linux.ibm.com>

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

L:	linux-s390@vger.kernel.org

S:	Supported

W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -15257,7 +15256,6 @@ F: net/iucv/ 
S390 NETWORK DRIVERS

M:	Julian Wiedmann <jwi@linux.ibm.com>

M:	Karsten Graul <kgraul@linux.ibm.com>

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

L:	linux-s390@vger.kernel.org

S:	Supported

W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -15828,7 +15826,6 @@ S: Maintained 
F:	drivers/misc/sgi-xp/









SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS









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









M:	Karsten Graul <kgraul@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported
































net/iucv/af_iucv.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -1434,7 +1434,8 @@ static int iucv_sock_shutdown(struct socket *sock, int how)







		break;









	}



















	if (how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) {









	if ((how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) &&









	    sk->sk_state == IUCV_CONNECTED) {









		if (iucv->transport == AF_IUCV_TRANS_IUCV) {









			txmsg.class = 0;









			txmsg.tag = 0;


































































CRA Git | Maintained and supported by SUSTech CRA and CCSE