Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f23fc156 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

serial167: fix read buffer overflow 



Check whether index is within bounds before grabbing the element.

Also, since NR_PORTS is defined ARRAY_SIZE(cy_port), cy_port[NR_PORTS] is
out of bounds as well.

[akpm@linux-foundation.org: cleanup, remove (long) casts]
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 196b3167

drivers/char/serial167.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -220,8 +220,7 @@ static inline int serial_paranoia_check(struct cyclades_port *info, char *name, 
		return 1;

		return 1;

	}

	}





	if ((long)info < (long)(&cy_port[0])

	if (info < &cy_port[0] || info >= &cy_port[NR_PORTS]) {

	    || (long)(&cy_port[NR_PORTS]) < (long)info) {

		printk("Warning: cyclades_port out of range for (%s) in %s\n",

		printk("Warning: cyclades_port out of range for (%s) in %s\n",

				name, routine);

				name, routine);

		return 1;

		return 1;
@@ -520,15 +519,13 @@ static irqreturn_t cd2401_tx_interrupt(int irq, void *dev_id) 
		panic("TxInt on debug port!!!");

		panic("TxInt on debug port!!!");

	}

	}

#endif

#endif



	info = &cy_port[channel];



	/* validate the port number (as configured and open) */

	/* validate the port number (as configured and open) */

	if ((channel < 0) || (NR_PORTS <= channel)) {

	if ((channel < 0) || (NR_PORTS <= channel)) {

		base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);

		base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);

		base_addr[CyTEOIR] = CyNOTRANS;

		base_addr[CyTEOIR] = CyNOTRANS;

		return IRQ_HANDLED;

		return IRQ_HANDLED;

	}

	}

	info = &cy_port[channel];

	info->last_active = jiffies;

	info->last_active = jiffies;

	if (info->tty == 0) {

	if (info->tty == 0) {

		base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);

		base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);