From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21D303F7875 for ; Wed, 3 Jun 2026 18:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780511962; cv=none; b=aUldy9pATyg0exoGpuGMekq95vLwg2bErlygwjemz+fDbnCuOm+wuRTTI9kaZKg6ved+I1INgHuuWLJt2AwfC7GWfNHZZxB8uxq1cOf3+RVvPhWJ0Et9NqxQOBllND5BERDdboD3gLi2y7e8es0Fix796WQ1qgel7dA32Dk2qFs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780511962; c=relaxed/simple; bh=/d5vu6FzDjUdc5vpSBDYQ8aC7S33EdRfCZpNFO9YxIQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WhGmTKigWEO/+gjFBukjRJCuYRCVUvyO30BI7pUDPRYo2Y/0A/DygPZJuw2zn6GBojAleJ6O+wm3lAQgkLb2SX3wdG6rj3kSjaXNPn1vld6z9pZUFhXCdG42VOvsP1f0ADFeGvqfCuoatosSIamX2Y3bV2B6eYrAp198qgAJPn8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=e5y0NUpT; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e5y0NUpT" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c8587427468so1881576a12.1 for ; Wed, 03 Jun 2026 11:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780511957; x=1781116757; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=79BiaAS61yq6Rc+Pw8/ABQwHPoIuPnEBPhTKKYRqkTY=; b=e5y0NUpT/V8WeJUCoCTk7KPQd9bAEXHQlV3ySPN04ZfvOeU7Z1gOQsS6sIpojIkzEa eChZ/qPspI9SjKG93V6R+MotzdBSlwQudwMq/9oa+Gv0Yaw/6Adg5ZyCplBFZCYoitQv 2Qk/i/lWL4Tgh5hqytPQ2EwJuj5U8p0DZb2uqGI+sEwKkhHzC0kIqOEfYhWYy5c1wdjq Tqzq/LNaPXQKzhXKa7Dsl9QRRK3QMxGXKeWmYGsOPcQDYUzBeiSCWT5UTcjw6KlY1dyo jp/sQ88xcCD/4SrL3wAfC7t62ab5UhTG9w2Nj5Yo45Xhqf6kC+ump1G57HUakazph31e q+/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780511957; x=1781116757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=79BiaAS61yq6Rc+Pw8/ABQwHPoIuPnEBPhTKKYRqkTY=; b=ppDR9GOA6snGuFxak54mhXrX6PRVXDYk5BIMWk4Bm/uwEFjLCyEiynu0ZLogJxuiHD puIJrTD1halS6TF6BVq7imMQPL5GLD8RStFybUTOdaXAOc57fOKoeTScaiY8hFW1Jr6W 08Iq6kKdxzQz1kM0fJ/XpywCRptm8b6aQHSo2hHH7G53u7TgXDSPANvSX2eEBIdh7UoX 2U4ZmokIKjRqyaOcHrZYtGNjGQ5oYWAjgBlYBmhniPWfHQE1QrBj9G5wqpEvwgP+X4vd 7Xk8f0FOt82hmXzM/ND5za18pjR4tvh0iZBfsJFrhCzzZOvlERSj84kHqQpY6PzGIT5+ /pXg== X-Forwarded-Encrypted: i=1; AFNElJ8VLCf2lprCnt809Hj1ufl/mdMcQ6UfLGY25Xqd9L2haOkpgK3/RbNxKYR9iPyB4UbXbrS7LH/sgt+kVC4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxv0mwg42gEYuhv/ZGQsnCsCT7dbFxka7tFjq/CjBJ++pT+PSw1 6pOIHApK0XHTaOEm/smUo12fWcmAJzUJVyhihHulP+V0kYmMQybYRLRS X-Gm-Gg: Acq92OE/LO02Y8LFwsHaO0ero4JtX2SKeYnk62NhVLKoDHhm+XUE4Xni9bIQmr4wV76 ux6zxXal4m4X1oxNhnqLNIxytaeay41HKFOLhU+9T4cx42zgEo9cD9BHzB0E6MpQPkjupKUt82F LLZeQnaUnCnOhfVY7W802sclEgvJFBspgyjvGm/1bf4NXZOMKYP6wdmZa8NzRRJg9GDoGRpEhdL Bn+613DkIWLplEti/l+LoTUkvlXxcs7hfQoSLa/hZGu4+Hpq8GeNXk7h4/93quYbEa23B7JEMQo FBRfq0dPEWJaIlqYGDjYRaB9XVlMvRp5CN029OFx8e6UeFdBQcRHcj7FUxb8BBaWfX1v1t8/tt4 b3Nw5m3NUcQjYu5I778i3AcAI+hsyJgS00Ev5GBO8WlYn3lP95QqHX+Q3/fmt2rQZ2mLLHzI8aV 4wMlEW8z8Fu5uLN5a0ZrSAPHE3DZTxRi8BxqGei5u+VYJcwm+fUs0J6tee+b/+w+9SXEI2CO7Zp o8d/njV7j1vcRN2RPLJIFeeUhZYmgplXxtALA== X-Received: by 2002:a17:903:4b50:b0:2c0:a373:89b9 with SMTP id d9443c01a7336-2c163a24bf2mr49279105ad.6.1780511957045; Wed, 03 Jun 2026 11:39:17 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16649c01asm32764915ad.74.2026.06.03.11.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 11:39:16 -0700 (PDT) From: Sungho Bae To: amit@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Sungho Bae Subject: [PATCH v3 2/4] virtio_console: fix hot-unplug races in TX paths Date: Thu, 4 Jun 2026 03:37:55 +0900 Message-Id: <20260603183757.21587-3-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260603183757.21587-1-baver.bae@gmail.com> References: <20260603183757.21587-1-baver.bae@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sungho Bae When a port is hot-unplugged, unplug_port() nullifies port->portdev. However, concurrent TX paths (__send_to_port, put_chars) could read a stale pointer or encounter a NULL pointer dereference. Add READ_ONCE(port->portdev) and NULL checks in the TX paths. In __send_to_port(), move the out_vq assignment inside the outvq_lock and check portdev under the lock. Correspondingly, update unplug_port() to NULL out port->portdev while holding the outvq_lock to serialize with __send_to_port(). In put_chars(), return count instead of 0 on unplug to prevent the hvc layer from spinning in an infinite retry loop. Signed-off-by: Sungho Bae --- drivers/char/virtio_console.c | 37 +++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index bbf5b3825f12..589a12261e23 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -600,11 +600,19 @@ static ssize_t __send_to_port(struct port *port, struct scatterlist *sg, int err; unsigned long flags; unsigned int len; - - out_vq = port->out_vq; + struct ports_device *portdev; spin_lock_irqsave(&port->outvq_lock, flags); + portdev = READ_ONCE(port->portdev); + + if (!portdev) { + in_count = 0; + goto free_and_done; + } + + out_vq = port->out_vq; + reclaim_consumed_buffers(port); err = virtqueue_add_outbuf(out_vq, sg, nents, buf, GFP_ATOMIC); @@ -1110,12 +1118,24 @@ static ssize_t put_chars(u32 vtermno, const u8 *buf, size_t count) struct port *port; struct scatterlist sg[1]; struct port_buffer *pbuf; + struct ports_device *portdev; port = find_port_by_vtermno(vtermno); if (!port) return -EPIPE; - pbuf = alloc_buf(port->portdev->vdev, count, 0, GFP_ATOMIC); + /* + * Silently drop output if device hot-unplug is in progress. + * portdev was NULLed by unplug_port() after hvc_remove() was + * already called, so the hvc layer will stop invoking put_chars() + * very soon. Returning count avoids a pointless retry loop in the + * interim. + */ + portdev = READ_ONCE(port->portdev); + if (!portdev) + return count; + + pbuf = alloc_buf(portdev->vdev, count, 0, GFP_ATOMIC); if (!pbuf) return -ENOMEM; @@ -1503,11 +1523,16 @@ static void unplug_port(struct port *port) remove_port_data(port); /* - * We should just assume the device itself has gone off -- - * else a close on an open port later will try to send out a - * control message. + * Null out portdev under outvq_lock so that __send_to_port() + * cannot race: it checks port->portdev inside the same lock + * and bails out if NULL, preventing any buffer from being + * enqueued to an already torn-down virtqueue. Also prevents + * a close on an open port later from sending a stale control + * message. */ + spin_lock_irq(&port->outvq_lock); port->portdev = NULL; + spin_unlock_irq(&port->outvq_lock); sysfs_remove_group(&port->dev->kobj, &port_attribute_group); device_destroy(&port_class, port->dev->devt); -- 2.34.1