From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Guanbing Huang <albanhuang@tencent.com>,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org
Cc: Jiri Slaby <jirislaby@kernel.org>
Subject: [PATCH v1 3/6] serial: port: Make ->iotype validation global in __uart_read_properties()
Date: Fri, 24 Jan 2025 18:10:48 +0200 [thread overview]
Message-ID: <20250124161530.398361-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20250124161530.398361-1-andriy.shevchenko@linux.intel.com>
In order to make code robust against potential changes in the future
move ->iotype validation outside of switch in __uart_read_properties().
If any code will be added in between that might leave the ->iotype value
unknown the validation catches this up.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/tty/serial/serial_port.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
index 85285c56fabf..2fc48cd63f6c 100644
--- a/drivers/tty/serial/serial_port.c
+++ b/drivers/tty/serial/serial_port.c
@@ -229,14 +229,15 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
break;
default:
port->iotype = UPIO_UNKNOWN;
- if (!use_defaults) {
- dev_err(dev, "Unsupported reg-io-width (%u)\n", value);
- return -EINVAL;
- }
break;
}
}
+ if (!use_defaults && port->iotype == UPIO_UNKNOWN) {
+ dev_err(dev, "Unsupported reg-io-width (%u)\n", value);
+ return -EINVAL;
+ }
+
/* Read the address mapping base offset (default: no offset) */
ret = device_property_read_u32(dev, "reg-offset", &value);
if (ret)
--
2.43.0.rc1.1336.g36b5255a03ac
next prev parent reply other threads:[~2025-01-24 16:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-24 16:10 [PATCH v1 0/6] serial: port: Fix UPIO_PORT iotype handling Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 1/6] serial: port: Assign ->iotype correctly when ->iobase is set Andy Shevchenko
2025-02-04 13:45 ` Greg Kroah-Hartman
2025-01-24 16:10 ` [PATCH v1 2/6] serial: port: Always update ->iotype in __uart_read_properties() Andy Shevchenko
2025-01-24 16:10 ` Andy Shevchenko [this message]
2025-01-24 16:10 ` [PATCH v1 4/6] serial: 8250_of: Remove unneeded ->iotype assignment Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 5/6] serial: 8250_platform: " Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 6/6] serial: 8250_pnp: " Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250124161530.398361-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=albanhuang@tencent.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.