Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp620052imm; Fri, 29 Jun 2018 03:42:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJhaDCNDIhHLawqRUeGvsUeHp8EuJ+15kHGStYPhqyK8DdsTXvzXebnaki+U4PYaELnoaYr X-Received: by 2002:a63:314f:: with SMTP id x76-v6mr11971711pgx.373.1530268936947; Fri, 29 Jun 2018 03:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530268936; cv=none; d=google.com; s=arc-20160816; b=nX49NFDx+dGuxQbaRezbfWPXbUlHxvFaN1UXzMxfqAIBVn0Lyt8GRLykQVybvB9shE uajmUcxxKXVC5WAhh6NjvUG6G7J4oJdRQlG3H/RqWeKN8hdblWVzDCQ0wl+D0ww2Ikhv +kOOLeVbl109ucPEk2OGiFOTf0KKSv4itxB/x7pYXjHEpIfx1vwUSUZO/63tv/Z2KLrf MOLaPN11sjJPhOBM7/E1xq2BIAaaHaWHThgNY+kE7PpPw+E0g/a9DXt0RD9ZoQqHIWa9 uwZIJwH8N93XROlthCrMv8zaXn3KfceA2mZl+97N868GR2U6tH+yfROp2DYq/HhuiO67 8thg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=MKmj6VY2+cqHGcI5uYvL4FcymvSQtny7nM8ISI2/jv4=; b=IuoXEROW68tHqB0N4R3vZFgCX7jMqdcpYaCNI8jggmXqsbZoS2pWsNi5+AFDilR2Ce SowCabkBUqQ3m2rr82Soxh9CeZS3sjvSxUMYwKcxBIQepvd3C9VcODkGD7mYoLs0u9z5 bijD5hCDTtArLebKpVfh4Oo/mhT0Z8W+Bd5j5CrmUqvMJM8kt8T4XWkwGo2ooxM33ahu jPwNYjzi1aan392I3GGQhdeTUBUy1j6ENMoCSgLPVmFAMX1zjinKts+KVs9/0jT1l+kv jGe6y/6FPcLBOV/cpvHhwnyOGuzPA30PYg4SfvQBwAZuz/ZAlTLRmiVIytwYaZoH+aiy IR3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tycho-ws.20150623.gappssmtp.com header.s=20150623 header.b=PwOqSh3c; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f90-v6si9388821plf.390.2018.06.29.03.42.02; Fri, 29 Jun 2018 03:42:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@tycho-ws.20150623.gappssmtp.com header.s=20150623 header.b=PwOqSh3c; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753722AbeF2KZl (ORCPT + 99 others); Fri, 29 Jun 2018 06:25:41 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:33089 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752599AbeF2KZj (ORCPT ); Fri, 29 Jun 2018 06:25:39 -0400 Received: by mail-io0-f193.google.com with SMTP id d185-v6so8031261ioe.0 for ; Fri, 29 Jun 2018 03:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tycho-ws.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MKmj6VY2+cqHGcI5uYvL4FcymvSQtny7nM8ISI2/jv4=; b=PwOqSh3cEigEoZE002YXr9nX9bnCrou+mJgB8WMsIN6o6Y6UmtjvEPTAEYuTfiGwYF EVdAhcfALF4FwXXs/mynblV5nqjGAcE5sYYz1Iy+Thgmqeun1b3kZ0QqvzisbC2lAbqA 2DGTzrWYy/AtdA6pJSc6N4LTU33z+IPIhksjKYbSJUdWTxmoS/XVOZl+1YWpE7QETBKh ODBji4zmS0XxDRvw7ngG2nWZcxa3QYFbovtOWzmxX/at7OZe5zYUAXN/PZ5T3kw/JF8z 8ynJFXchuv+P2rf3ErJnXUDq3K2J89f5+iuGwU+IwejTK4+yT9VcT5y5cNe1NysMe99J 7s4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKmj6VY2+cqHGcI5uYvL4FcymvSQtny7nM8ISI2/jv4=; b=Huy7yuoK44YijfWj3RERZ9/pWo2tU2sHmxhKIwsi3JEB+gqHxchTlv7Aq+9BCBrIqG 6sLxXi7DemMqjJtYxKrON5hTYr8PjXh4sVBs9NtAOXIvoxxIdLNWNpVruZYR6TBkKOiY OCGVUg7HBltAoX0WR1w1FmC8RuTEBDEFvLCfJYIspH3lXI4b9NcGi3JegnS9iejCzbrI NPROfzi7SgXfbH1jYYshWZS1wBX/KhH5gEtOI1MKLalMPCmnpleCjXaWqfSRMlL2/jAn uJzRd/J0T9CYEpKu0ig2xbeJeGra0w/0ox4NfpuwkXrFtMuzLjnHYKHmjm33bsnMSmoA nI6g== X-Gm-Message-State: APt69E1rZHxvEaEZl+ru6blAEEM1bHvr19Hip3l4bC8tDOzaW65JS0JK MViiI1VlaIN6cQDgLGDSvTeaaQ== X-Received: by 2002:a6b:3042:: with SMTP id w63-v6mr8284748iow.223.1530267938152; Fri, 29 Jun 2018 03:25:38 -0700 (PDT) Received: from cisco.lan ([8.24.24.129]) by smtp.gmail.com with ESMTPSA id s130-v6sm399436itb.33.2018.06.29.03.25.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jun 2018 03:25:36 -0700 (PDT) From: Tycho Andersen To: Greg Kroah-Hartman , Jiri Slaby Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Serge E . Hallyn" , Tycho Andersen Subject: [PATCH v2] uart: fix race between uart_put_char() and uart_shutdown() Date: Fri, 29 Jun 2018 04:24:46 -0600 Message-Id: <20180629102446.11189-1-tycho@tycho.ws> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628120542.GA4065@kroah.com> References: <20180628120542.GA4065@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have reports of the following crash: PID: 7 TASK: ffff88085c6d61c0 CPU: 1 COMMAND: "kworker/u25:0" #0 [ffff88085c6db710] machine_kexec at ffffffff81046239 #1 [ffff88085c6db760] crash_kexec at ffffffff810fc248 #2 [ffff88085c6db830] oops_end at ffffffff81008ae7 #3 [ffff88085c6db860] no_context at ffffffff81050b8f #4 [ffff88085c6db8b0] __bad_area_nosemaphore at ffffffff81050d75 #5 [ffff88085c6db900] bad_area_nosemaphore at ffffffff81050e83 #6 [ffff88085c6db910] __do_page_fault at ffffffff8105132e #7 [ffff88085c6db9b0] do_page_fault at ffffffff8105152c #8 [ffff88085c6db9c0] page_fault at ffffffff81a3f122 [exception RIP: uart_put_char+149] RIP: ffffffff814b67b5 RSP: ffff88085c6dba78 RFLAGS: 00010006 RAX: 0000000000000292 RBX: ffffffff827c5120 RCX: 0000000000000081 RDX: 0000000000000000 RSI: 000000000000005f RDI: ffffffff827c5120 RBP: ffff88085c6dba98 R8: 000000000000012c R9: ffffffff822ea320 R10: ffff88085fe4db04 R11: 0000000000000001 R12: ffff881059f9c000 R13: 0000000000000001 R14: 000000000000005f R15: 0000000000000fba ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #9 [ffff88085c6dbaa0] tty_put_char at ffffffff81497544 #10 [ffff88085c6dbac0] do_output_char at ffffffff8149c91c #11 [ffff88085c6dbae0] __process_echoes at ffffffff8149cb8b #12 [ffff88085c6dbb30] commit_echoes at ffffffff8149cdc2 #13 [ffff88085c6dbb60] n_tty_receive_buf_fast at ffffffff8149e49b #14 [ffff88085c6dbbc0] __receive_buf at ffffffff8149ef5a #15 [ffff88085c6dbc20] n_tty_receive_buf_common at ffffffff8149f016 #16 [ffff88085c6dbca0] n_tty_receive_buf2 at ffffffff8149f194 #17 [ffff88085c6dbcb0] flush_to_ldisc at ffffffff814a238a #18 [ffff88085c6dbd50] process_one_work at ffffffff81090be2 #19 [ffff88085c6dbe20] worker_thread at ffffffff81091b4d #20 [ffff88085c6dbeb0] kthread at ffffffff81096384 #21 [ffff88085c6dbf50] ret_from_fork at ffffffff81a3d69f​ after slogging through some dissasembly: ffffffff814b6720 : ffffffff814b6720: 55 push %rbp ffffffff814b6721: 48 89 e5 mov %rsp,%rbp ffffffff814b6724: 48 83 ec 20 sub $0x20,%rsp ffffffff814b6728: 48 89 1c 24 mov %rbx,(%rsp) ffffffff814b672c: 4c 89 64 24 08 mov %r12,0x8(%rsp) ffffffff814b6731: 4c 89 6c 24 10 mov %r13,0x10(%rsp) ffffffff814b6736: 4c 89 74 24 18 mov %r14,0x18(%rsp) ffffffff814b673b: e8 b0 8e 58 00 callq ffffffff81a3f5f0 ffffffff814b6740: 4c 8b a7 88 02 00 00 mov 0x288(%rdi),%r12 ffffffff814b6747: 45 31 ed xor %r13d,%r13d ffffffff814b674a: 41 89 f6 mov %esi,%r14d ffffffff814b674d: 49 83 bc 24 70 01 00 cmpq $0x0,0x170(%r12) ffffffff814b6754: 00 00 ffffffff814b6756: 49 8b 9c 24 80 01 00 mov 0x180(%r12),%rbx ffffffff814b675d: 00 ffffffff814b675e: 74 2f je ffffffff814b678f ffffffff814b6760: 48 89 df mov %rbx,%rdi ffffffff814b6763: e8 a8 67 58 00 callq ffffffff81a3cf10 <_raw_spin_lock_irqsave> ffffffff814b6768: 41 8b 8c 24 78 01 00 mov 0x178(%r12),%ecx ffffffff814b676f: 00 ffffffff814b6770: 89 ca mov %ecx,%edx ffffffff814b6772: f7 d2 not %edx ffffffff814b6774: 41 03 94 24 7c 01 00 add 0x17c(%r12),%edx ffffffff814b677b: 00 ffffffff814b677c: 81 e2 ff 0f 00 00 and $0xfff,%edx ffffffff814b6782: 75 23 jne ffffffff814b67a7 ffffffff814b6784: 48 89 c6 mov %rax,%rsi ffffffff814b6787: 48 89 df mov %rbx,%rdi ffffffff814b678a: e8 e1 64 58 00 callq ffffffff81a3cc70 <_raw_spin_unlock_irqrestore> ffffffff814b678f: 44 89 e8 mov %r13d,%eax ffffffff814b6792: 48 8b 1c 24 mov (%rsp),%rbx ffffffff814b6796: 4c 8b 64 24 08 mov 0x8(%rsp),%r12 ffffffff814b679b: 4c 8b 6c 24 10 mov 0x10(%rsp),%r13 ffffffff814b67a0: 4c 8b 74 24 18 mov 0x18(%rsp),%r14 ffffffff814b67a5: c9 leaveq ffffffff814b67a6: c3 retq ffffffff814b67a7: 49 8b 94 24 70 01 00 mov 0x170(%r12),%rdx ffffffff814b67ae: 00 ffffffff814b67af: 48 63 c9 movslq %ecx,%rcx ffffffff814b67b2: 41 b5 01 mov $0x1,%r13b ffffffff814b67b5: 44 88 34 0a mov %r14b,(%rdx,%rcx,1) ffffffff814b67b9: 41 8b 94 24 78 01 00 mov 0x178(%r12),%edx ffffffff814b67c0: 00 ffffffff814b67c1: 83 c2 01 add $0x1,%edx ffffffff814b67c4: 81 e2 ff 0f 00 00 and $0xfff,%edx ffffffff814b67ca: 41 89 94 24 78 01 00 mov %edx,0x178(%r12) ffffffff814b67d1: 00 ffffffff814b67d2: eb b0 jmp ffffffff814b6784 ffffffff814b67d4: 66 66 66 2e 0f 1f 84 data32 data32 nopw %cs:0x0(%rax,%rax,1) ffffffff814b67db: 00 00 00 00 00 for our build, this is crashing at: circ->buf[circ->head] = c; Looking in uart_port_startup(), it seems that circ->buf (state->xmit.buf) protected by the "per-port mutex", which based on uart_port_check() is state->port.mutex. Indeed, the lock acquired in uart_put_char() is uport->lock, i.e. not the same lock. Anyway, since the lock is not acquired, if uart_shutdown() is called, the last chunk of that function may release state->xmit.buf before its assigned to null, and cause the race above. To fix it, let's lock uport->lock when allocating/deallocating state->xmit.buf in addition to the per-port mutex. v2: switch to locking uport->lock on allocation/deallocation instead of locking the per-port mutex in uart_put_char. Note that since uport->lock is a spin lock, we have to switch the allocation to GFP_ATOMIC. Signed-off-by: Tycho Andersen --- drivers/tty/serial/serial_core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 9c14a453f73c..790f3ea7ffca 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -181,7 +181,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state, int init_hw) { struct uart_port *uport = uart_port_check(state); - unsigned long page; + unsigned long page, flags = 0; int retval = 0; if (uport->type == PORT_UNKNOWN) @@ -196,15 +196,19 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state, * Initialise and allocate the transmit and temporary * buffer. */ + uart_port_lock(state, flags); if (!state->xmit.buf) { - /* This is protected by the per port mutex */ - page = get_zeroed_page(GFP_KERNEL); - if (!page) + page = get_zeroed_page(GFP_ATOMIC); + if (!page) { + uart_port_unlock(uport, flags); return -ENOMEM; + } state->xmit.buf = (unsigned char *) page; uart_circ_clear(&state->xmit); } + uart_port_unlock(uport, flags); + retval = uport->ops->startup(uport); if (retval == 0) { @@ -263,6 +267,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) { struct uart_port *uport = uart_port_check(state); struct tty_port *port = &state->port; + unsigned long flags = 0; /* * Set the TTY IO error marker @@ -295,10 +300,12 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) /* * Free the transmit buffer page. */ + uart_port_lock(state, flags); if (state->xmit.buf) { free_page((unsigned long)state->xmit.buf); state->xmit.buf = NULL; } + uart_port_unlock(uport, flags); } /** -- 2.17.1