mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
6062d85892
Fixes: - CVE-2020-10757 The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was backported which needed some adaptations to other code. Run tested: ath79 Build tested: ath79 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
--- a/drivers/tty/serial/8250/8250.h
|
|
+++ b/drivers/tty/serial/8250/8250.h
|
|
@@ -80,6 +80,7 @@ struct serial8250_config {
|
|
#define UART_CAP_MINI (1 << 17) /* Mini UART on BCM283X family lacks:
|
|
* STOP PARITY EPAR SPAR WLEN5 WLEN6
|
|
*/
|
|
+#define UART_CAP_NMOD (1 << 18) /* UART doesn't do termios */
|
|
|
|
#define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */
|
|
#define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */
|
|
--- a/drivers/tty/serial/8250/8250_port.c
|
|
+++ b/drivers/tty/serial/8250/8250_port.c
|
|
@@ -297,7 +297,7 @@ static const struct serial8250_config ua
|
|
.tx_loadsz = 16,
|
|
.fcr = UART_FCR_ENABLE_FIFO |
|
|
UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT,
|
|
- .flags = UART_CAP_FIFO,
|
|
+ .flags = UART_CAP_FIFO | UART_CAP_NMOD,
|
|
},
|
|
[PORT_NPCM] = {
|
|
.name = "Nuvoton 16550",
|
|
@@ -2650,6 +2650,11 @@ serial8250_do_set_termios(struct uart_po
|
|
unsigned long flags;
|
|
unsigned int baud, quot, frac = 0;
|
|
|
|
+ if (up->capabilities & UART_CAP_NMOD) {
|
|
+ termios->c_cflag = 0;
|
|
+ return;
|
|
+ }
|
|
+
|
|
if (up->capabilities & UART_CAP_MINI) {
|
|
termios->c_cflag &= ~(CSTOPB | PARENB | PARODD | CMSPAR);
|
|
if ((termios->c_cflag & CSIZE) == CS5 ||
|