From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51A32606A31B for ; Wed, 4 Nov 2026 02:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=FI9dlaD2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Unsubscribe-Post:List-Owner; bh=s/T82fdrNEfcVyYXGpDWXPy2xqV64CQ6AKa2Kc2YGrk=; b=FI9dlaD2pmnFn1WaWwc19yGo4o g5FQiIF2lnj+XlkQKTBBujGQe9oAzxcmkDdWhMIpru/eDXw0sFR/DdUFZ8fWjQvSRN35EYXzsUIvc 26zMd1/KMj1WwLHFo5JSzZb+B9DNBxtkI6WGN7J4UbwdnkMMJZl7H4smSb+Zfno/Xb72bR5fa++cA 4ohCJM2pld16052Rp2CZk7YWEULiRgFZMFltrnW6G6TPHv3+25mBYiUq8mztRb+VgPMK7TfoVPs31 eo4cS87YOjF/AclzZSz2nSQSa4RAPHH6YOwDpjV0O8jMRpySevIP9s4+7MMQR6oQkzRSIVuGD5gaX ER4ulSzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xOQWi-000000048M0-2ihr; Wed, 04 Nov 2026 02:15:00 +0000 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xOQWf-000000048JG-3Iv0; Wed, 04 Nov 2026 02:14:59 +0000 Received: from dfae2b116770.home.arpa (unknown [36.110.52.2]) by APP-01 (Coremail) with SMTP id qwCowAB3Zf8clepqS3Y+AA--.9737S2; Wed, 04 Nov 2026 10:14:52 +0800 (CST) From: Wentao Liang To: Greg Kroah-Hartman , Jiri Slaby , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH] serial: meson: unregister the UART driver if port registration fails Date: Wed, 4 Nov 2026 02:15:01 +0000 Message-Id: <20261104021501.1468500-1-vulab@iscas.ac.cn> X-Mailer: git-send-email 2.34.1 X-Archived-By: MIME-Version: 1.0 X-CM-TRANSID: qwCowAB3Zf8clepqS3Y+AA--.9737S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Cw4xZrW3ur4xAFWrur15Arb_yoW8Ar4rpF 4DGFZ8trWUKF4xJ3WUAF45AFW3KayIqa47ury7J3sa9ry3JFy8K34ftayYyF1DtrykGFyv vr1UG3y8ua1UZFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvmb7Iv0xC_Kw4lb4IE77IF4wAFc2x0x2IEx4CE42xK8VAvwI8I cIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2 AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v2 6r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14 v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xf McIj6xIIjxv20xvE14v26rWY6Fy7McIj6I8E87Iv67AKxVW8Jr0_Cr1UMcvjeVCFs4IE7x kEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0E wIxGrwCF04k20xvE74AGY7Cv6cx26r48ZrWUJr1UMxC20s026xCaFVCjc4AY6r1j6r4UMI 8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AK xVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1UMIIF0xvE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E 87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnU UI43ZEXa7IU5ENtDUUUUU== X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiCRUBA2rqY-m4YgAAse X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261103_181458_213516_A5A134AF X-CRM114-Status: GOOD ( 12.09 ) X-Spam-Score: -0.9 (/) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 meson_uart_probe() registers the shared uart_driver on the first port and relies on meson_uart_remove() to unregister it once the last port is removed. If uart_add_one_port() fails, probe returns an error, so remove is never called and the driver stays registered, leaking its tty driver and per-port state. Remember whether this probe registered the driver and unregister it again when adding the port fails. Fixes: e71aab9d6132 ("tty: serial: meson: apply ttyS devname instead of ttyAML for new SoCs") Cc: stable@vger.kernel.org Assisted-by: DeepSeek-V4.1-Flash and OpenAI Codex Signed-off-by: Wentao Liang --- drivers/tty/serial/meson_uart.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index a6cb2a535f9d..a51362f73dee 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -702,6 +702,7 @@ static int meson_uart_probe(struct platform_device *pdev) int ret = 0; int irq; bool has_rtscts; + bool registered = false; if (pdev->dev.of_node) pdev->id = of_alias_get_id(pdev->dev.of_node, "serial"); @@ -753,6 +754,7 @@ static int meson_uart_probe(struct platform_device *pdev) if (ret) return dev_err_probe(&pdev->dev, ret, "can't register uart driver\n"); + registered = true; } port->iotype = UPIO_MEM; @@ -781,8 +783,11 @@ static int meson_uart_probe(struct platform_device *pdev) } ret = uart_add_one_port(uart_driver, port); - if (ret) + if (ret) { meson_ports[pdev->id] = NULL; + if (registered) + uart_unregister_driver(uart_driver); + } return ret; } -- 2.34.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic