The patch titled serial167: fix read buffer overflow has been added to the -mm tree. Its filename is serial167-fix-read-buffer-overflow.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial167: fix read buffer overflow From: Roel Kluin <roel.kluin@xxxxxxxxx> 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. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Cc: Jiri Slaby <jirislaby@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/serial167.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/char/serial167.c~serial167-fix-read-buffer-overflow drivers/char/serial167.c --- a/drivers/char/serial167.c~serial167-fix-read-buffer-overflow +++ a/drivers/char/serial167.c @@ -222,7 +222,7 @@ static inline int serial_paranoia_check( } if ((long)info < (long)(&cy_port[0]) - || (long)(&cy_port[NR_PORTS]) < (long)info) { + || (long)(&cy_port[NR_PORTS-1]) < (long)info) { printk("Warning: cyclades_port out of range for (%s) in %s\n", name, routine); return 1; @@ -521,15 +521,13 @@ static irqreturn_t cd2401_tx_interrupt(i panic("TxInt on debug port!!!"); } #endif - - info = &cy_port[channel]; - /* validate the port number (as configured and open) */ if ((channel < 0) || (NR_PORTS <= channel)) { base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy); base_addr[CyTEOIR] = CyNOTRANS; return IRQ_HANDLED; } + info = &cy_port[channel]; info->last_active = jiffies; if (info->tty == 0) { base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy); _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are linux-next.patch x86-fix-buffer-overflow-in-efi_init.patch kgdb-remove-redundant-test.patch s3c-fix-check-of-index-into-s3c_gpios.patch stmp3xxx-deallocation-with-negative-index-of-descriptors.patch dm-strncpy-does-not-null-terminate-string.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch powerpc-fsl-booke-read-buffer-overflow.patch powerpc-avoid-calculating-possibly-invalid-address.patch media-strncpy-does-not-null-terminate-string.patch siano-read-buffer-overflow.patch drivers-media-video-bw-qcamc-fix-read-buffer-overflow.patch stk-webcam-read-buffer-overflow.patch hid-fix-read-buffer-overflow.patch ipath-strncpy-does-not-null-terminate-string.patch kvm-fix-read-buffer-overflow.patch mips-decrease-size-of-au1xxx_dbdma_pm_regs.patch mips-read-buffer-overflow.patch slram-read-buffer-overflow.patch slram-read-buffer-overflow-cleanup.patch mtd-fix-read-buffer-overflow.patch irda-fix-read-buffer-overflow.patch hfc_usb-fix-read-buffer-overflow.patch atlx-strncpy-does-not-null-terminate-string.patch ext4-remove-redundant-test-on-unsigned.patch ocfs2-keep-index-within-status_map.patch drivers-parisc-pdc_stablec-fix-read-buffer-overflow.patch cyclades-read-buffer-overflow.patch serial167-fix-read-buffer-overflow.patch serial167-fix-read-buffer-overflow-fix.patch perf-fix-read-buffer-overflow.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch ibmmca-buffer-overflow.patch scsi-eata-fix-buffer-overflow.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-iprh-fix-buffer-overflow.patch drivers-scsi-u14-34fc-fix-uffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch usb-gadget-read-buffer-overflow.patch i915-fix-read-outside-array-bounds.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch blackfin-fix-read-buffer-overflow.patch arch-alpha-boot-tools-objstripc-wrong-variable-tested-after-open.patch m32r-remove-redundant-tests-on-unsigned.patch m68k-count-can-reach-51-not-50.patch m68k-cnt-reaches-1-not-0.patch dme1737-keep-index-within-pwm_config.patch ncpfs-read-buffer-overflow.patch smbfs-read-buffer-overflow.patch platinumfb-misplaced-parenthesis.patch sisfb-read-buffer-overflow.patch drivers-video-console-newport_conc-fix-read-outside-array-bounds.patch mwave-fix-read-buffer-overflow.patch adfs-remove-redundant-test-on-unsigned.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html