Skip to contentSkip to conversation

net/iucv: fixes 2020-11-09

PATCH Applied Julian Wiedmann 2 participants 5 messages Nov 9, 2020 – Nov 11, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v2 cover net/iucv: fixes 2020-11-09

Hi Jakub,

please apply the following patch series to netdev's net tree.

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)

Thanks,
Julian

Ursula Braun (2):
net/af_iucv: fix null pointer dereference on shutdown
MAINTAINERS: remove Ursula Braun as s390 network maintainer

 MAINTAINERS        | 3 ---
 net/iucv/af_iucv.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/2 net/af_iucv: fix null pointer dereference on shutdown

From: Ursula Braun <[email protected]>

syzbot reported the following KASAN finding:

BUG: KASAN: nullptr-dereference in iucv_send_ctrl+0x390/0x3f0 net/iucv/af_iucv.c:385
Read of size 2 at addr 000000000000021e by task syz-executor907/519

CPU: 0 PID: 519 Comm: syz-executor907 Not tainted 5.9.0-syzkaller-07043-gbcf9877ad213 #0
Hardware name: IBM 3906 M04 701 (KVM/Linux)
Call Trace:
 [<00000000c576af60>] unwind_start arch/s390/include/asm/unwind.h:65 [inline]
 [<00000000c576af60>] show_stack+0x180/0x228 arch/s390/kernel/dumpstack.c:135
 [<00000000c9dcd1f8>] __dump_stack lib/dump_stack.c:77 [inline]
 [<00000000c9dcd1f8>] dump_stack+0x268/0x2f0 lib/dump_stack.c:118
 [<00000000c5fed016>] print_address_description.constprop.0+0x5e/0x218 mm/kasan/report.c:383
 [<00000000c5fec82a>] __kasan_report mm/kasan/report.c:517 [inline]
 [<00000000c5fec82a>] kasan_report+0x11a/0x168 mm/kasan/report.c:534
 [<00000000c98b5b60>] iucv_send_ctrl+0x390/0x3f0 net/iucv/af_iucv.c:385
 [<00000000c98b6262>] iucv_sock_shutdown+0x44a/0x4c0 net/iucv/af_iucv.c:1457
 [<00000000c89d3a54>] __sys_shutdown+0x12c/0x1c8 net/socket.c:2204
 [<00000000c89d3b70>] __do_sys_shutdown net/socket.c:2212 [inline]
 [<00000000c89d3b70>] __s390x_sys_shutdown+0x38/0x48 net/socket.c:2210
 [<00000000c9e36eac>] system_call+0xe0/0x28c arch/s390/kernel/entry.S:415

There is nothing to shutdown if a connection has never been established. Besides that iucv->hs_dev is not yet initialized if a socket is in IUCV_OPEN state and iucv->path is not yet initialized if socket is in IUCV_BOUND state.
So, just skip the shutdown calls for a socket in these states.

Fixes eac3731bd04c ("[S390]: Add AF_IUCV socket support")
Fixes 82492a355fac ("af_iucv: add shutdown for HS transport")
[jwi: correct one Fixes tag]
---
 net/iucv/af_iucv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/iucv/af_iucv.c +2 -1
index d80572074667..047238f01ba6 100644
@@ -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;
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 2/2 MAINTAINERS: remove Ursula Braun as s390 network maintainer

In reply to Julian Wiedmann

From: Ursula Braun <[email protected]>

I am retiring soon. Thus this patch removes myself from the MAINTAINERS file (s390 network).

[jwi: fix up the subject]
---
 MAINTAINERS | 3 ---
 1 file changed, 3 deletions(-)
MAINTAINERS +0 -3
index cd123d0a6a2d..fa11fe773df5 100644
@@ -15246,7 +15246,6 @@ F:	drivers/iommu/s390-iommu.c
 S390 IUCV NETWORK LAYER
 M:	Julian Wiedmann <[email protected]>
 M:	Karsten Graul <[email protected]>
-M:	Ursula Braun <[email protected]>
 L:	[email protected]
 S:	Supported
 W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -15257,7 +15256,6 @@ F:	net/iucv/
 S390 NETWORK DRIVERS
 M:	Julian Wiedmann <[email protected]>
 M:	Karsten Graul <[email protected]>
-M:	Ursula Braun <[email protected]>
 L:	[email protected]
 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 <[email protected]>
 M:	Karsten Graul <[email protected]>
 L:	[email protected]
 S:	Supported
Signature · 1 line
2.17.1
maintainer Applied
#4 lore raw
In reply to Julian Wiedmann
Quoted 9 lines · On Mon, 9 Nov 2020 08:57:04 +0100 Julian Wiedmann wrote:

Hi Jakub,

please apply the following patch series to netdev's net tree.

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)

Applied, and queued, thanks!

maintainer
#3 lore raw

Re: [PATCH net v2 2/2] MAINTAINERS: remove Ursula Braun as s390 network maintainer

In reply to Julian Wiedmann
Quoted 4 lines · On Mon, 9 Nov 2020 08:57:06 +0100 Julian Wiedmann wrote:

From: Ursula Braun <[email protected]>

I am retiring soon. Thus this patch removes myself from the MAINTAINERS file (s390 network).

Thanks for all the work over the years! :)