Unverified Commit 159a55c8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6964 v2 CVE-2024-27000 

Merge Pull Request from: @ci-robot 
 
PR sync from: "GONG, Ruiqi" <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GS2DAC3G6JW3ONCYOQOVXEAYU2B4VYOE/ 
CVE-2024-27000

Emil Kronborg (1):
  serial: mxs-auart: add spinlock around changing cts state

Randy Dunlap (1):
  serial: core: fix kernel-doc for uart_port_unlock_irqrestore()

Thomas Gleixner (1):
  serial: core: Provide port lock wrappers


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/I9L5H7 
 
Link:https://gitee.com/openeuler/kernel/pulls/6964

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7bb852e4 32b0c1b6

drivers/tty/serial/mxs-auart.c

+6 −2
Original line number Diff line number Diff line
@@ -1122,11 +1122,13 @@ static void mxs_auart_set_ldisc(struct uart_port *port, 


static irqreturn_t mxs_auart_irq_handle(int irq, void *context)

{

	u32 istat;

	u32 istat, stat;

	struct mxs_auart_port *s = context;

	u32 mctrl_temp = s->mctrl_prev;

	u32 stat = mxs_read(s, REG_STAT);



	uart_port_lock(&s->port);



	stat = mxs_read(s, REG_STAT);

	istat = mxs_read(s, REG_INTR);



	/* ack irq */
@@ -1162,6 +1164,8 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context) 
		istat &= ~AUART_INTR_TXIS;

	}



	uart_port_unlock(&s->port);



	return IRQ_HANDLED;

}

include/linux/serial_core.h

+79 −0
Original line number Diff line number Diff line
@@ -259,6 +259,85 @@ struct uart_port { 
	void			*private_data;		/* generic platform data pointer */

};



/**

 * uart_port_lock - Lock the UART port

 * @up:		Pointer to UART port structure

 */

static inline void uart_port_lock(struct uart_port *up)

{

	spin_lock(&up->lock);

}



/**

 * uart_port_lock_irq - Lock the UART port and disable interrupts

 * @up:		Pointer to UART port structure

 */

static inline void uart_port_lock_irq(struct uart_port *up)

{

	spin_lock_irq(&up->lock);

}



/**

 * uart_port_lock_irqsave - Lock the UART port, save and disable interrupts

 * @up:		Pointer to UART port structure

 * @flags:	Pointer to interrupt flags storage

 */

static inline void uart_port_lock_irqsave(struct uart_port *up, unsigned long *flags)

{

	spin_lock_irqsave(&up->lock, *flags);

}



/**

 * uart_port_trylock - Try to lock the UART port

 * @up:		Pointer to UART port structure

 *

 * Returns: True if lock was acquired, false otherwise

 */

static inline bool uart_port_trylock(struct uart_port *up)

{

	return spin_trylock(&up->lock);

}



/**

 * uart_port_trylock_irqsave - Try to lock the UART port, save and disable interrupts

 * @up:		Pointer to UART port structure

 * @flags:	Pointer to interrupt flags storage

 *

 * Returns: True if lock was acquired, false otherwise

 */

static inline bool uart_port_trylock_irqsave(struct uart_port *up, unsigned long *flags)

{

	return spin_trylock_irqsave(&up->lock, *flags);

}



/**

 * uart_port_unlock - Unlock the UART port

 * @up:		Pointer to UART port structure

 */

static inline void uart_port_unlock(struct uart_port *up)

{

	spin_unlock(&up->lock);

}



/**

 * uart_port_unlock_irq - Unlock the UART port and re-enable interrupts

 * @up:		Pointer to UART port structure

 */

static inline void uart_port_unlock_irq(struct uart_port *up)

{

	spin_unlock_irq(&up->lock);

}



/**

 * uart_port_unlock_irqrestore - Unlock the UART port, restore interrupts

 * @up:		Pointer to UART port structure

 * @flags:	The saved interrupt flags for restore

 */

static inline void uart_port_unlock_irqrestore(struct uart_port *up, unsigned long flags)

{

	spin_unlock_irqrestore(&up->lock, flags);

}



static inline int serial_port_in(struct uart_port *up, int offset)

{

	return up->serial_in(up, offset);