From: Greg Kroah-Hartman Date: Wed, 26 Feb 2020 08:40:33 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.4.215~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a9cbeeb4dcaf07e38dadf6292306ad777139e55;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: floppy-check-fdc-index-for-errors-before-assigning-it.patch staging-android-ashmem-disallow-ashmem-memory-from-being-remapped.patch staging-vt6656-fix-sign-of-rx_dbm-to-bb_pre_ed_rssi.patch --- diff --git a/queue-4.4/floppy-check-fdc-index-for-errors-before-assigning-it.patch b/queue-4.4/floppy-check-fdc-index-for-errors-before-assigning-it.patch new file mode 100644 index 00000000000..b0495148dea --- /dev/null +++ b/queue-4.4/floppy-check-fdc-index-for-errors-before-assigning-it.patch @@ -0,0 +1,65 @@ +From 2e90ca68b0d2f5548804f22f0dd61145516171e3 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Fri, 21 Feb 2020 12:43:35 -0800 +Subject: floppy: check FDC index for errors before assigning it + +From: Linus Torvalds + +commit 2e90ca68b0d2f5548804f22f0dd61145516171e3 upstream. + +Jordy Zomer reported a KASAN out-of-bounds read in the floppy driver in +wait_til_ready(). + +Which on the face of it can't happen, since as Willy Tarreau points out, +the function does no particular memory access. Except through the FDCS +macro, which just indexes a static allocation through teh current fdc, +which is always checked against N_FDC. + +Except the checking happens after we've already assigned the value. + +The floppy driver is a disgrace (a lot of it going back to my original +horrd "design"), and has no real maintainer. Nobody has the hardware, +and nobody really cares. But it still gets used in virtual environment +because it's one of those things that everybody supports. + +The whole thing should be re-written, or at least parts of it should be +seriously cleaned up. The 'current fdc' index, which is used by the +FDCS macro, and which is often shadowed by a local 'fdc' variable, is a +prime example of how not to write code. + +But because nobody has the hardware or the motivation, let's just fix up +the immediate problem with a nasty band-aid: test the fdc index before +actually assigning it to the static 'fdc' variable. + +Reported-by: Jordy Zomer +Cc: Willy Tarreau +Cc: Dan Carpenter +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/floppy.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/block/floppy.c ++++ b/drivers/block/floppy.c +@@ -848,14 +848,17 @@ static void reset_fdc_info(int mode) + /* selects the fdc and drive, and enables the fdc's input/dma. */ + static void set_fdc(int drive) + { ++ unsigned int new_fdc = fdc; ++ + if (drive >= 0 && drive < N_DRIVE) { +- fdc = FDC(drive); ++ new_fdc = FDC(drive); + current_drive = drive; + } +- if (fdc != 1 && fdc != 0) { ++ if (new_fdc >= N_FDC) { + pr_info("bad fdc value\n"); + return; + } ++ fdc = new_fdc; + set_dor(fdc, ~0, 8); + #if N_FDC > 1 + set_dor(1 - fdc, ~8, 0); diff --git a/queue-4.4/series b/queue-4.4/series index 776c2419b28..9d99150d3c0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -80,3 +80,6 @@ microblaze-prevent-the-overflow-of-the-start.patch brd-check-and-limit-max_part-par.patch selinux-ensure-we-cleanup-the-internal-avc-counters-.patch enic-prevent-waking-up-stopped-tx-queues-over-watchdog-reset.patch +floppy-check-fdc-index-for-errors-before-assigning-it.patch +staging-android-ashmem-disallow-ashmem-memory-from-being-remapped.patch +staging-vt6656-fix-sign-of-rx_dbm-to-bb_pre_ed_rssi.patch diff --git a/queue-4.4/staging-android-ashmem-disallow-ashmem-memory-from-being-remapped.patch b/queue-4.4/staging-android-ashmem-disallow-ashmem-memory-from-being-remapped.patch new file mode 100644 index 00000000000..8a83f42fa6c --- /dev/null +++ b/queue-4.4/staging-android-ashmem-disallow-ashmem-memory-from-being-remapped.patch @@ -0,0 +1,73 @@ +From 6d67b0290b4b84c477e6a2fc6e005e174d3c7786 Mon Sep 17 00:00:00 2001 +From: Suren Baghdasaryan +Date: Mon, 27 Jan 2020 15:56:16 -0800 +Subject: staging: android: ashmem: Disallow ashmem memory from being remapped + +From: Suren Baghdasaryan + +commit 6d67b0290b4b84c477e6a2fc6e005e174d3c7786 upstream. + +When ashmem file is mmapped, the resulting vma->vm_file points to the +backing shmem file with the generic fops that do not check ashmem +permissions like fops of ashmem do. If an mremap is done on the ashmem +region, then the permission checks will be skipped. Fix that by disallowing +mapping operation on the backing shmem file. + +Reported-by: Jann Horn +Signed-off-by: Suren Baghdasaryan +Cc: stable # 4.4,4.9,4.14,4.18,5.4 +Signed-off-by: Todd Kjos +Reviewed-by: Joel Fernandes (Google) +Link: https://lore.kernel.org/r/20200127235616.48920-1-tkjos@google.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/android/ashmem.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +--- a/drivers/staging/android/ashmem.c ++++ b/drivers/staging/android/ashmem.c +@@ -357,8 +357,23 @@ static inline vm_flags_t calc_vm_may_fla + _calc_vm_trans(prot, PROT_EXEC, VM_MAYEXEC); + } + ++static int ashmem_vmfile_mmap(struct file *file, struct vm_area_struct *vma) ++{ ++ /* do not allow to mmap ashmem backing shmem file directly */ ++ return -EPERM; ++} ++ ++static unsigned long ++ashmem_vmfile_get_unmapped_area(struct file *file, unsigned long addr, ++ unsigned long len, unsigned long pgoff, ++ unsigned long flags) ++{ ++ return current->mm->get_unmapped_area(file, addr, len, pgoff, flags); ++} ++ + static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) + { ++ static struct file_operations vmfile_fops; + struct ashmem_area *asma = file->private_data; + int ret = 0; + +@@ -399,6 +414,19 @@ static int ashmem_mmap(struct file *file + } + vmfile->f_mode |= FMODE_LSEEK; + asma->file = vmfile; ++ /* ++ * override mmap operation of the vmfile so that it can't be ++ * remapped which would lead to creation of a new vma with no ++ * asma permission checks. Have to override get_unmapped_area ++ * as well to prevent VM_BUG_ON check for f_ops modification. ++ */ ++ if (!vmfile_fops.mmap) { ++ vmfile_fops = *vmfile->f_op; ++ vmfile_fops.mmap = ashmem_vmfile_mmap; ++ vmfile_fops.get_unmapped_area = ++ ashmem_vmfile_get_unmapped_area; ++ } ++ vmfile->f_op = &vmfile_fops; + } + get_file(asma->file); + diff --git a/queue-4.4/staging-vt6656-fix-sign-of-rx_dbm-to-bb_pre_ed_rssi.patch b/queue-4.4/staging-vt6656-fix-sign-of-rx_dbm-to-bb_pre_ed_rssi.patch new file mode 100644 index 00000000000..cc5e8320e30 --- /dev/null +++ b/queue-4.4/staging-vt6656-fix-sign-of-rx_dbm-to-bb_pre_ed_rssi.patch @@ -0,0 +1,36 @@ +From 93134df520f23f4e9998c425b8987edca7016817 Mon Sep 17 00:00:00 2001 +From: Malcolm Priestley +Date: Tue, 4 Feb 2020 19:34:02 +0000 +Subject: staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi. + +From: Malcolm Priestley + +commit 93134df520f23f4e9998c425b8987edca7016817 upstream. + +bb_pre_ed_rssi is an u8 rx_dm always returns negative signed +values add minus operator to always yield positive. + +fixes issue where rx sensitivity is always set to maximum because +the unsigned numbers were always greater then 100. + +Fixes: 63b9907f58f1 ("staging: vt6656: mac80211 conversion: create rx function.") +Cc: stable +Signed-off-by: Malcolm Priestley +Link: https://lore.kernel.org/r/aceac98c-6e69-3ce1-dfec-2bf27b980221@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/vt6656/dpc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/vt6656/dpc.c ++++ b/drivers/staging/vt6656/dpc.c +@@ -144,7 +144,7 @@ int vnt_rx_data(struct vnt_private *priv + + vnt_rf_rssi_to_dbm(priv, *rssi, &rx_dbm); + +- priv->bb_pre_ed_rssi = (u8)rx_dbm + 1; ++ priv->bb_pre_ed_rssi = (u8)-rx_dbm + 1; + priv->current_rssi = priv->bb_pre_ed_rssi; + + frame = skb_data + 8;