drop patches that broke the build

4 files changed, 0 insertions, 167 deletions

diff --git a/ext4-fix-punch-hole-for-inline_data-file-systems.patch b/ext4-fix-punch-hole-for-inline_data-file-systems.patch
deleted file mode 100644
index 3b091d2..0000000
--- a/ext4-fix-punch-hole-for-inline_data-file-systems.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c1e8220bd316d8ae8e524df39534b8a412a45d5e Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Fri, 23 Aug 2019 22:38:00 -0400
-Subject: ext4: fix punch hole for inline_data file systems
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit c1e8220bd316d8ae8e524df39534b8a412a45d5e upstream.
-
-If a program attempts to punch a hole on an inline data file, we need
-to convert it to a normal file first.
-
-This was detected using ext4/032 using the adv configuration.  Simple
-reproducer:
-
-mke2fs -Fq -t ext4 -O inline_data /dev/vdc
-mount /vdc
-echo "" > /vdc/testfile
-xfs_io -c 'truncate 33554432' /vdc/testfile
-xfs_io -c 'fpunch 0 1048576' /vdc/testfile
-umount /vdc
-e2fsck -fy /dev/vdc
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/inode.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -3639,6 +3639,15 @@ int ext4_punch_hole(struct inode *inode,
- 
- 	trace_ext4_punch_hole(inode, offset, length, 0);
- 
-+	ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
-+	if (ext4_has_inline_data(inode)) {
-+		down_write(&EXT4_I(inode)->i_mmap_sem);
-+		ret = ext4_convert_inline_data(inode);
-+		up_write(&EXT4_I(inode)->i_mmap_sem);
-+		if (ret)
-+			return ret;
-+	}
-+
- 	/*
- 	 * Write out all dirty pages to avoid race conditions
- 	 * Then release them.
diff --git a/i40e-check-__i40e_vf_disable-bit-in-i40e_sync_filters_subtask.patch b/i40e-check-__i40e_vf_disable-bit-in-i40e_sync_filters_subtask.patch
deleted file mode 100644
index 482dee1..0000000
--- a/i40e-check-__i40e_vf_disable-bit-in-i40e_sync_filters_subtask.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From a7542b87607560d0b89e7ff81d870bd6ff8835cb Mon Sep 17 00:00:00 2001
-From: Stefan Assmann <sassmann@kpanic.de>
-Date: Wed, 21 Aug 2019 16:09:29 +0200
-Subject: i40e: check __I40E_VF_DISABLE bit in i40e_sync_filters_subtask
-
-From: Stefan Assmann <sassmann@kpanic.de>
-
-commit a7542b87607560d0b89e7ff81d870bd6ff8835cb upstream.
-
-While testing VF spawn/destroy the following panic occurred.
-
-BUG: unable to handle kernel NULL pointer dereference at 0000000000000029
-[...]
-Workqueue: i40e i40e_service_task [i40e]
-RIP: 0010:i40e_sync_vsi_filters+0x6fd/0xc60 [i40e]
-[...]
-Call Trace:
- ? __switch_to_asm+0x35/0x70
- ? __switch_to_asm+0x41/0x70
- ? __switch_to_asm+0x35/0x70
- ? _cond_resched+0x15/0x30
- i40e_sync_filters_subtask+0x56/0x70 [i40e]
- i40e_service_task+0x382/0x11b0 [i40e]
- ? __switch_to_asm+0x41/0x70
- ? __switch_to_asm+0x41/0x70
- process_one_work+0x1a7/0x3b0
- worker_thread+0x30/0x390
- ? create_worker+0x1a0/0x1a0
- kthread+0x112/0x130
- ? kthread_bind+0x30/0x30
- ret_from_fork+0x35/0x40
-
-Investigation revealed a race where pf->vf[vsi->vf_id].trusted may get
-accessed by the watchdog via i40e_sync_filters_subtask() although
-i40e_free_vfs() already free'd pf->vf.
-To avoid this the call to i40e_sync_vsi_filters() in
-i40e_sync_filters_subtask() needs to be guarded by __I40E_VF_DISABLE,
-which is also used by i40e_free_vfs().
-
-Note: put the __I40E_VF_DISABLE check after the
-__I40E_MACVLAN_SYNC_PENDING check as the latter is more likely to
-trigger.
-
-CC: stable@vger.kernel.org
-Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
-Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
-Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/ethernet/intel/i40e/i40e_main.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/net/ethernet/intel/i40e/i40e_main.c
-+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
-@@ -2658,6 +2658,10 @@ static void i40e_vsi_config_dcb_rings(st
- 
- 	if (!(vsi->back->flags & I40E_FLAG_DCB_ENABLED))
- 		return;
-+	if (test_and_set_bit(__I40E_VF_DISABLE, pf->state)) {
-+		set_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state);
-+		return;
-+	}
- 
- 	for (n = 0; n < I40E_MAX_TRAFFIC_CLASS; n++) {
- 		if (!(vsi->tc_config.enabled_tc & (1 << n)))
-@@ -2672,6 +2676,7 @@ static void i40e_vsi_config_dcb_rings(st
- 			tx_ring->dcb_tc = n;
- 		}
- 	}
-+	clear_bit(__I40E_VF_DISABLE, pf->state);
- }
- 
- /**
diff --git a/ovl-filter-of-trusted-xattr-results-in-audit.patch b/ovl-filter-of-trusted-xattr-results-in-audit.patch
deleted file mode 100644
index f5cf375..0000000
--- a/ovl-filter-of-trusted-xattr-results-in-audit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5c2e9f346b815841f9bed6029ebcb06415caf640 Mon Sep 17 00:00:00 2001
-From: Mark Salyzyn <salyzyn@android.com>
-Date: Thu, 29 Aug 2019 11:30:14 -0700
-Subject: ovl: filter of trusted xattr results in audit
-
-From: Mark Salyzyn <salyzyn@android.com>
-
-commit 5c2e9f346b815841f9bed6029ebcb06415caf640 upstream.
-
-When filtering xattr list for reading, presence of trusted xattr
-results in a security audit log.  However, if there is other content
-no errno will be set, and if there isn't, the errno will be -ENODATA
-and not -EPERM as is usually associated with a lack of capability.
-The check does not block the request to list the xattrs present.
-
-Switch to ns_capable_noaudit to reflect a more appropriate check.
-
-Signed-off-by: Mark Salyzyn <salyzyn@android.com>
-Cc: linux-security-module@vger.kernel.org
-Cc: kernel-team@android.com
-Cc: stable@vger.kernel.org # v3.18+
-Fixes: a082c6f680da ("ovl: filter trusted xattr for non-admin")
-Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/overlayfs/inode.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/fs/overlayfs/inode.c
-+++ b/fs/overlayfs/inode.c
-@@ -265,7 +265,8 @@ static bool ovl_can_list(const char *s)
- 		return true;
- 
- 	/* Never list trusted.overlay, list other trusted for superuser only */
--	return !ovl_is_private_xattr(s) && capable(CAP_SYS_ADMIN);
-+	return !ovl_is_private_xattr(s) &&
-+	       ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN);
- }
- 
- ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
diff --git a/series b/series
index 93125ee..ce878e6 100644
--- a/series
+++ b/series
@@ -22,13 +22,10 @@ kvm-x86-set-ctxt-have_exception-in-x86_decode_insn.patch
 kvm-x86-manually-calculate-reserved-bits-when-loading-pdptrs.patch
 arm-zynq-use-memcpy_toio-instead-of-memcpy-on-smp-bring-up.patch
 alarmtimer-use-eopnotsupp-instead-of-enotsupp.patch
-i40e-check-__i40e_vf_disable-bit-in-i40e_sync_filters_subtask.patch
-ovl-filter-of-trusted-xattr-results-in-audit.patch
 btrfs-fix-use-after-free-when-using-the-tree-modification-log.patch
 btrfs-relinquish-cpus-in-btrfs_compare_trees.patch
 cfg80211-purge-frame-registrations-on-iftype-change.patch
 dev-mem-bail-out-upon-sigkill.patch
-ext4-fix-punch-hole-for-inline_data-file-systems.patch
 quota-fix-wrong-condition-in-is_quota_modification.patch
 hwrng-core-don-t-wait-on-add_early_randomness.patch
 i2c-riic-clear-nack-in-tend-isr.patch