From 2c60bfb6edc9ad238cf23c6836e5b0a0be271979 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Sun, 14 Jun 2020 10:58:49 +0200 Subject: [PATCH] Drop "fs/namespace.c: fix mountpoint reference counter race" --- debian/changelog | 1 - ...ix-mountpoint-reference-counter-race.patch | 48 ------------------- debian/patches/series | 1 - 3 files changed, 50 deletions(-) delete mode 100644 debian/patches/bugfix/all/fs-namespace.c-fix-mountpoint-reference-counter-race.patch diff --git a/debian/changelog b/debian/changelog index 3ceaff968..2b221b2a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,7 +80,6 @@ linux (4.19.119-1) UNRELEASED; urgency=medium - iio: xilinx-xadc: Fix clearing interrupt when enabling trigger - iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode - iio: xilinx-xadc: Make sure not exceed maximum samplerate - - fs/namespace.c: fix mountpoint reference counter race - USB: sisusbvga: Change port variable from signed to unsigned - USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE - USB: early: Handle AMD's spec-compliant identifiers, too diff --git a/debian/patches/bugfix/all/fs-namespace.c-fix-mountpoint-reference-counter-race.patch b/debian/patches/bugfix/all/fs-namespace.c-fix-mountpoint-reference-counter-race.patch deleted file mode 100644 index 70e9d44a4..000000000 --- a/debian/patches/bugfix/all/fs-namespace.c-fix-mountpoint-reference-counter-race.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Piotr Krysiuk -Date: Mon, 27 Apr 2020 11:34:12 +0100 -Subject: fs/namespace.c: fix mountpoint reference counter race -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f511dc75d22e0c000fc70b54f670c2c17f5fba9a -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2020-12114 - -A race condition between threads updating mountpoint reference counter -affects longterm releases 4.4.220, 4.9.220, 4.14.177 and 4.19.118. - -The mountpoint reference counter corruption may occur when: -* one thread increments m_count member of struct mountpoint - [under namespace_sem, but not holding mount_lock] - pivot_root() -* another thread simultaneously decrements the same m_count - [under mount_lock, but not holding namespace_sem] - put_mountpoint() - unhash_mnt() - umount_mnt() - mntput_no_expire() - -To fix this race condition, grab mount_lock before updating m_count in -pivot_root(). - -Reference: CVE-2020-12114 -Cc: Al Viro -Signed-off-by: Piotr Krysiuk -Signed-off-by: Greg Kroah-Hartman ---- - fs/namespace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/namespace.c b/fs/namespace.c -index 1fce41ba3535..741f40cd955e 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -3142,8 +3142,8 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, - /* make certain new is below the root */ - if (!is_path_reachable(new_mnt, new.dentry, &root)) - goto out4; -- root_mp->m_count++; /* pin it so it won't go away */ - lock_mount_hash(); -+ root_mp->m_count++; /* pin it so it won't go away */ - detach_mnt(new_mnt, &parent_path); - detach_mnt(root_mnt, &root_parent); - if (root_mnt->mnt.mnt_flags & MNT_LOCKED) { --- -2.27.0.rc0 - diff --git a/debian/patches/series b/debian/patches/series index 350da55b4..997536256 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -299,7 +299,6 @@ features/arm/staging-vc04_services-Use-correct-cache-line-size.patch debian/i386-686-pae-pci-set-pci-nobios-by-default.patch debian/ntfs-mark-it-as-broken.patch bugfix/all/selinux-properly-handle-multiple-messages-in-selinux.patch -bugfix/all/fs-namespace.c-fix-mountpoint-reference-counter-race.patch bugfix/all/propagate_one-mnt_set_mountpoint-needs-mount_lock.patch bugfix/all/usb-core-fix-free-while-in-use-bug-in-the-usb-s-glib.patch bugfix/x86/kvm-svm-fix-potential-memory-leak-in-svm_cpu_init.patch