From: Greg Kroah-Hartman Date: Mon, 1 Apr 2019 07:28:22 +0000 (+0200) Subject: drop serial port patch from 3.18 X-Git-Tag: v3.18.138~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f8f75e885d9915218e9b68604fd43193e2b47fd;p=thirdparty%2Fkernel%2Fstable-queue.git drop serial port patch from 3.18 --- diff --git a/queue-3.18/series b/queue-3.18/series index 866a6e5cd73..75b1e5e3cc1 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -37,7 +37,6 @@ mac8390-fix-mmio-access-size-probe.patch alsa-pcm-fix-possible-oob-access-in-pcm-oss-plugins.patch alsa-pcm-don-t-suspend-stream-in-unrecoverable-pcm-state.patch scsi-zfcp-fix-scsi_eh-host-reset-with-port_forced-erp-for-non-npiv-fcp-devices.patch -tty-mxs-auart-fix-a-potential-null-pointer-dereference.patch serial-max310x-fix-to-avoid-potential-null-pointer-dereference.patch usb-serial-cp210x-add-new-device-id.patch usb-serial-ftdi_sio-add-additional-novatech-products.patch diff --git a/queue-3.18/tty-mxs-auart-fix-a-potential-null-pointer-dereference.patch b/queue-3.18/tty-mxs-auart-fix-a-potential-null-pointer-dereference.patch deleted file mode 100644 index 1298ac8f6e6..00000000000 --- a/queue-3.18/tty-mxs-auart-fix-a-potential-null-pointer-dereference.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6734330654dac550f12e932996b868c6d0dcb421 Mon Sep 17 00:00:00 2001 -From: Kangjie Lu -Date: Thu, 14 Mar 2019 02:21:51 -0500 -Subject: tty: mxs-auart: fix a potential NULL pointer dereference - -From: Kangjie Lu - -commit 6734330654dac550f12e932996b868c6d0dcb421 upstream. - -In case ioremap fails, the fix returns -ENOMEM to avoid NULL -pointer dereferences. -Multiple places use port.membase. - -Signed-off-by: Kangjie Lu -Cc: stable -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/tty/serial/mxs-auart.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/tty/serial/mxs-auart.c -+++ b/drivers/tty/serial/mxs-auart.c -@@ -1060,6 +1060,10 @@ static int mxs_auart_probe(struct platfo - - s->port.mapbase = r->start; - s->port.membase = ioremap(r->start, resource_size(r)); -+ if (!s->port.membase) { -+ ret = -ENOMEM; -+ goto out_disable_clks; -+ } - s->port.ops = &mxs_auart_ops; - s->port.iotype = UPIO_MEM; - s->port.fifosize = MXS_AUART_FIFO_SIZE;