Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp3066351ioo; Sun, 29 May 2022 11:51:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQaMgxD0qrjWk/egfZpP5enoFu1jAEhiXBwgNObw2rWJ6SD2XvsIyy+71E3ZmStcGtxSfB X-Received: by 2002:a17:902:8f86:b0:162:22ff:496b with SMTP id z6-20020a1709028f8600b0016222ff496bmr34231360plo.105.1653850317682; Sun, 29 May 2022 11:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653850317; cv=none; d=google.com; s=arc-20160816; b=QQ3NSgFZoF78aK1mzMCR5FahF0+gtoUuOdI+j30OKPhOYtLVvzYZ2jHzC21PgCEd0Y 9aZQMlUcKIbuQFuAxVCGsbfSiN2jgXIUeRfTU52yohDNlQq7Lr9S4cKkN/vPTvE32Hyh nWBXA+N8kQVodjf5y7NIUN/U1+t3V+EjbQnQZqz6Fia5NMK4rd917t0XGuC1ikDqDlZM wYb7Nyu0sDyqrgTW/yrP/++ubgfKeSRdeJyuF6yn2W+BuMVDst0of/N9c/mhBXgl1ayA qMHhdUVsui18NMWy47ZptSCP/PzxXNwQVGAp4/7aLTibEWJfzdm23gtSH4ph6nEIUby3 3kXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+x+7esITuEjTahDQpOkrlpvxyvUZTU5N43BUwJS8j6w=; b=ewkA+0YTtJvMGAuR7YfS92fJWGb8VUvIv40z8rGcDGCxJT6TkpkhkFJN1Zgo5mC9/p R0lvIjx+g49y9+d+OfXFDQgLL/+udiG2tX/l5Yev0k4slLj1lZc0mnen+eVCdXDm/1xx pmrvD0eHYTMOX7/4C3ELGHXHZvXad52vgyni9no/Dl4GQYN/SICA/sgK/ncvP+RnVbIH aqDSFHSdVwaX2LLvB7WaxNZGiph7EAxCEw8w3NS2r/OytHnY9NsbzUULOOAunIhpIW8H vBcRIVHOHbiCQpjfGgduQELSjr9lukSfizseb6TCvCa94ATHp2VSIBhDoyGF5EXhBrw5 KBNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LDguF+Zm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t184-20020a6381c1000000b003fba1a964adsi10483468pgd.686.2022.05.29.11.51.26; Sun, 29 May 2022 11:51:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LDguF+Zm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230263AbiE2Nq0 (ORCPT + 99 others); Sun, 29 May 2022 09:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbiE2NqY (ORCPT ); Sun, 29 May 2022 09:46:24 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B9341939F5 for ; Sun, 29 May 2022 06:46:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653831981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+x+7esITuEjTahDQpOkrlpvxyvUZTU5N43BUwJS8j6w=; b=LDguF+ZmBRSerbTKaKQ5bnVs9irn750NqvzOeqazZDqzVAufxU4rFMOgDHBZ4EMj0u7gDa ZCTr07OVVceNKyvTahhlT0EpklHBBEx473ph708nqnvi9ygKExlZvl+AY1RiaoA+kf2x7A gAFNnAxYnAJchIqTXwIPYeExaBqFQck= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-290-5VoAR_7MO0aPOeMpJlJVCA-1; Sun, 29 May 2022 09:46:20 -0400 X-MC-Unique: 5VoAR_7MO0aPOeMpJlJVCA-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-f2bdeb5298so5622383fac.5 for ; Sun, 29 May 2022 06:46:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+x+7esITuEjTahDQpOkrlpvxyvUZTU5N43BUwJS8j6w=; b=bdQoqFsNAhktcFgujeJB6I5b9RJWQRjS1z04tynOb5GK6XAS8UsRLRuKVLBgOkqJsM WcUyXtM+zCA6J6BP4pD4qryA6Sp5uYf/4IiBGxaMGzHf+oUQG5DR0T5fl6TniNu/GjmO HrgBh8hRW2m3Tv7/UwGrpmSpg0DAmeG3uK4HLQFnOWN8koWV7Ybezz1sfR+CcGqS4Vkz AdNmRbXDyh1SLNjHl6HlCLKjWJwoHaQhgqhgkwH5n/T56apHXUDzkPbLxGhgbFAZL4x9 RW+uK8+3Ph+nzAoJts7si0rAh7Wn1AseXLAFEe7pjZU9bg/A961l0D7kdAMQ/zkMVBxS 4ynw== X-Gm-Message-State: AOAM532TqWwKjED+DeTB/BuYdow6SNuZvg/c2AzjFEs1qLnIWT89cFw/ TDqgHpTc0gWsX+ua3JuB8Em8mVWALl8P0B8Xa3uyv4e+QW5XvbYK0CiT5cvap+sfL6+zoiW2n9K 67/S72auNOlHAC5Xsz7txPUD1 X-Received: by 2002:a05:6870:589a:b0:f2:fafb:3268 with SMTP id be26-20020a056870589a00b000f2fafb3268mr5161989oab.68.1653831979891; Sun, 29 May 2022 06:46:19 -0700 (PDT) X-Received: by 2002:a05:6870:589a:b0:f2:fafb:3268 with SMTP id be26-20020a056870589a00b000f2fafb3268mr5161978oab.68.1653831979679; Sun, 29 May 2022 06:46:19 -0700 (PDT) Received: from dell-per740-01.7a2m.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id y13-20020a9d714d000000b0060aea5bbc87sm3958874otj.18.2022.05.29.06.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 06:46:19 -0700 (PDT) From: Tom Rix To: gregkh@linuxfoundation.org, jirislaby@kernel.org, nathan@kernel.org, ndesaulniers@google.com, peter@hurleysoftware.com Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Tom Rix Subject: [PATCH] serial: core: check if uart_get_info succeeds before using Date: Sun, 29 May 2022 09:46:05 -0400 Message-Id: <20220529134605.12881-1-trix@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clang static analysis reports this representative issue drivers/tty/serial/serial_core.c:2818:9: warning: 3rd function call argument is an uninitialized value [core.CallAndMessage] return sprintf(buf, "%d\n", tmp.iomem_reg_shift); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ uart_get_info() is used the *show() functions. When uart_get_info() fails, what is reported is garbage. So check if uart_get_info() succeeded. Fixes: 4047b37122d1 ("serial: core: Prevent unsafe uart port access, part 1") Signed-off-by: Tom Rix --- drivers/tty/serial/serial_core.c | 52 ++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 9a85b41caa0a..4160f6711c5d 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2690,7 +2690,9 @@ static ssize_t uartclk_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.baud_base * 16); } @@ -2700,7 +2702,9 @@ static ssize_t type_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.type); } @@ -2710,7 +2714,9 @@ static ssize_t line_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.line); } @@ -2721,7 +2727,9 @@ static ssize_t port_show(struct device *dev, struct tty_port *port = dev_get_drvdata(dev); unsigned long ioaddr; - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + ioaddr = tmp.port; if (HIGH_BITS_OFFSET) ioaddr |= (unsigned long)tmp.port_high << HIGH_BITS_OFFSET; @@ -2734,7 +2742,9 @@ static ssize_t irq_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.irq); } @@ -2744,7 +2754,9 @@ static ssize_t flags_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "0x%X\n", tmp.flags); } @@ -2754,7 +2766,9 @@ static ssize_t xmit_fifo_size_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.xmit_fifo_size); } @@ -2764,7 +2778,9 @@ static ssize_t close_delay_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.close_delay); } @@ -2774,7 +2790,9 @@ static ssize_t closing_wait_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.closing_wait); } @@ -2784,7 +2802,9 @@ static ssize_t custom_divisor_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.custom_divisor); } @@ -2794,7 +2814,9 @@ static ssize_t io_type_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.io_type); } @@ -2804,7 +2826,9 @@ static ssize_t iomem_base_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "0x%lX\n", (unsigned long)tmp.iomem_base); } @@ -2814,7 +2838,9 @@ static ssize_t iomem_reg_shift_show(struct device *dev, struct serial_struct tmp; struct tty_port *port = dev_get_drvdata(dev); - uart_get_info(port, &tmp); + if (uart_get_info(port, &tmp)) + return 0; + return sprintf(buf, "%d\n", tmp.iomem_reg_shift); } -- 2.27.0