+++ /dev/null
-From 2d8ae8c417db284f598dffb178cc01e7db0f1821 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <brauner@kernel.org>
-Date: Tue, 2 May 2023 15:36:02 +0200
-Subject: nfsd: use vfs setgid helper
-
-From: Christian Brauner <brauner@kernel.org>
-
-commit 2d8ae8c417db284f598dffb178cc01e7db0f1821 upstream.
-
-We've aligned setgid behavior over multiple kernel releases. The details
-can be found in commit cf619f891971 ("Merge tag 'fs.ovl.setgid.v6.2' of
-git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping") and
-commit 426b4ca2d6a5 ("Merge tag 'fs.setgid.v6.0' of
-git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux").
-Consistent setgid stripping behavior is now encapsulated in the
-setattr_should_drop_sgid() helper which is used by all filesystems that
-strip setgid bits outside of vfs proper. Usually ATTR_KILL_SGID is
-raised in e.g., chown_common() and is subject to the
-setattr_should_drop_sgid() check to determine whether the setgid bit can
-be retained. Since nfsd is raising ATTR_KILL_SGID unconditionally it
-will cause notify_change() to strip it even if the caller had the
-necessary privileges to retain it. Ensure that nfsd only raises
-ATR_KILL_SGID if the caller lacks the necessary privileges to retain the
-setgid bit.
-
-Without this patch the setgid stripping tests in LTP will fail:
-
-> As you can see, the problem is S_ISGID (0002000) was dropped on a
-> non-group-executable file while chown was invoked by super-user, while
-
-[...]
-
-> fchown02.c:66: TFAIL: testfile2: wrong mode permissions 0100700, expected 0102700
-
-[...]
-
-> chown02.c:57: TFAIL: testfile2: wrong mode permissions 0100700, expected 0102700
-
-With this patch all tests pass.
-
-Reported-by: Sherry Yang <sherry.yang@oracle.com>
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Reviewed-by: Jeff Layton <jlayton@kernel.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/nfsd/vfs.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
-@@ -323,7 +323,9 @@ nfsd_sanitize_attrs(struct inode *inode,
- iap->ia_mode &= ~S_ISGID;
- } else {
- /* set ATTR_KILL_* bits and let VFS handle it */
-- iap->ia_valid |= (ATTR_KILL_SUID | ATTR_KILL_SGID);
-+ iap->ia_valid |= ATTR_KILL_SUID;
-+ iap->ia_valid |=
-+ setattr_should_drop_sgid(&nop_mnt_idmap, inode);
- }
- }
- }
mmc-core-disable-trim-on-micron-mtfc4gacajcn-1m.patch
mmc-mmci-set-probe_prefer_asynchronous.patch
mmc-sdhci-fix-dma-configure-compatibility-issue-when-64bit-dma-mode-is-used.patch
-wifi-ath10k-serialize-wake_tx_queue-ops.patch
bcache-fixup-btree_cache_wait-list-damage.patch
bcache-remove-unnecessary-null-point-check-in-node-allocations.patch
bcache-fix-__bch_btree_node_alloc-to-make-the-failure-behavior-consistent.patch
integrity-fix-possible-multiple-allocation-in-integrity_inode_get.patch
autofs-use-flexible-array-in-ioctl-structure.patch
shmem-use-ramfs_kill_sb-for-kill_sb-method-of-ramfs-based-tmpfs.patch
-nfsd-use-vfs-setgid-helper.patch
jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsystem.patch
fs-avoid-empty-option-when-generating-legacy-mount-string.patch
ext4-remove-ext4-locking-of-moved-directory.patch
+++ /dev/null
-From b719ebc37a1eacd4fd4f1264f731b016e5ec0c6e Mon Sep 17 00:00:00 2001
-From: Alexander Wetzel <alexander@wetzel-home.de>
-Date: Thu, 23 Mar 2023 17:55:27 +0100
-Subject: wifi: ath10k: Serialize wake_tx_queue ops
-
-From: Alexander Wetzel <alexander@wetzel-home.de>
-
-commit b719ebc37a1eacd4fd4f1264f731b016e5ec0c6e upstream.
-
-Serialize the ath10k implementation of the wake_tx_queue ops.
-ath10k_mac_op_wake_tx_queue() must not run concurrent since it's using
-ieee80211_txq_schedule_start().
-
-The intend of this patch is to sort out an issue discovered in the discussion
-referred to by the Link tag.
-
-I can't test it with real hardware and thus just implemented the per-ac queue
-lock Felix suggested. One obvious alternative to the per-ac lock would be to
-bring back the txqs_lock commit bb2edb733586 ("ath10k: migrate to mac80211 txq
-scheduling") dropped.
-
-Fixes: bb2edb733586 ("ath10k: migrate to mac80211 txq scheduling")
-Reported-by: Felix Fietkau <nbd@nbd.name>
-Link: https://lore.kernel.org/r/519b5bb9-8899-ae7c-4eff-f3116cdfdb56@nbd.name
-CC: <stable@vger.kernel.org>
-Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20230323165527.156414-1-alexander@wetzel-home.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/wireless/ath/ath10k/core.c | 3 +++
- drivers/net/wireless/ath/ath10k/core.h | 3 +++
- drivers/net/wireless/ath/ath10k/mac.c | 6 ++++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/ath/ath10k/core.c
-+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -3333,6 +3333,9 @@ struct ath10k *ath10k_core_create(size_t
- mutex_init(&ar->dump_mutex);
- spin_lock_init(&ar->data_lock);
-
-+ for (int ac = 0; ac < IEEE80211_NUM_ACS; ac++)
-+ spin_lock_init(&ar->queue_lock[ac]);
-+
- INIT_LIST_HEAD(&ar->peers);
- init_waitqueue_head(&ar->peer_mapping_wq);
- init_waitqueue_head(&ar->htt.empty_tx_wq);
---- a/drivers/net/wireless/ath/ath10k/core.h
-+++ b/drivers/net/wireless/ath/ath10k/core.h
-@@ -1154,6 +1154,9 @@ struct ath10k {
- /* protects shared structure data */
- spinlock_t data_lock;
-
-+ /* serialize wake_tx_queue calls per ac */
-+ spinlock_t queue_lock[IEEE80211_NUM_ACS];
-+
- struct list_head arvifs;
- struct list_head peers;
- struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS];
---- a/drivers/net/wireless/ath/ath10k/mac.c
-+++ b/drivers/net/wireless/ath/ath10k/mac.c
-@@ -4545,13 +4545,14 @@ static void ath10k_mac_op_wake_tx_queue(
- {
- struct ath10k *ar = hw->priv;
- int ret;
-- u8 ac;
-+ u8 ac = txq->ac;
-
- ath10k_htt_tx_txq_update(hw, txq);
- if (ar->htt.tx_q_state.mode != HTT_TX_MODE_SWITCH_PUSH)
- return;
-
-- ac = txq->ac;
-+ spin_lock_bh(&ar->queue_lock[ac]);
-+
- ieee80211_txq_schedule_start(hw, ac);
- txq = ieee80211_next_txq(hw, ac);
- if (!txq)
-@@ -4566,6 +4567,7 @@ static void ath10k_mac_op_wake_tx_queue(
- ath10k_htt_tx_txq_update(hw, txq);
- out:
- ieee80211_txq_schedule_end(hw, ac);
-+ spin_unlock_bh(&ar->queue_lock[ac]);
- }
-
- /* Must not be called with conf_mutex held as workers can use that also. */
mmc-core-disable-trim-on-kingston-emmc04g-m627.patch
mmc-core-disable-trim-on-micron-mtfc4gacajcn-1m.patch
mmc-sdhci-fix-dma-configure-compatibility-issue-when-64bit-dma-mode-is-used.patch
-wifi-ath10k-serialize-wake_tx_queue-ops.patch
bcache-remove-unnecessary-null-point-check-in-node-allocations.patch
integrity-fix-possible-multiple-allocation-in-integrity_inode_get.patch
jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsystem.patch
+++ /dev/null
-From b719ebc37a1eacd4fd4f1264f731b016e5ec0c6e Mon Sep 17 00:00:00 2001
-From: Alexander Wetzel <alexander@wetzel-home.de>
-Date: Thu, 23 Mar 2023 17:55:27 +0100
-Subject: wifi: ath10k: Serialize wake_tx_queue ops
-
-From: Alexander Wetzel <alexander@wetzel-home.de>
-
-commit b719ebc37a1eacd4fd4f1264f731b016e5ec0c6e upstream.
-
-Serialize the ath10k implementation of the wake_tx_queue ops.
-ath10k_mac_op_wake_tx_queue() must not run concurrent since it's using
-ieee80211_txq_schedule_start().
-
-The intend of this patch is to sort out an issue discovered in the discussion
-referred to by the Link tag.
-
-I can't test it with real hardware and thus just implemented the per-ac queue
-lock Felix suggested. One obvious alternative to the per-ac lock would be to
-bring back the txqs_lock commit bb2edb733586 ("ath10k: migrate to mac80211 txq
-scheduling") dropped.
-
-Fixes: bb2edb733586 ("ath10k: migrate to mac80211 txq scheduling")
-Reported-by: Felix Fietkau <nbd@nbd.name>
-Link: https://lore.kernel.org/r/519b5bb9-8899-ae7c-4eff-f3116cdfdb56@nbd.name
-CC: <stable@vger.kernel.org>
-Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
-Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
-Link: https://lore.kernel.org/r/20230323165527.156414-1-alexander@wetzel-home.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/wireless/ath/ath10k/core.c | 3 +++
- drivers/net/wireless/ath/ath10k/core.h | 3 +++
- drivers/net/wireless/ath/ath10k/mac.c | 6 ++++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/ath/ath10k/core.c
-+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -3195,6 +3195,9 @@ struct ath10k *ath10k_core_create(size_t
- mutex_init(&ar->dump_mutex);
- spin_lock_init(&ar->data_lock);
-
-+ for (int ac = 0; ac < IEEE80211_NUM_ACS; ac++)
-+ spin_lock_init(&ar->queue_lock[ac]);
-+
- INIT_LIST_HEAD(&ar->peers);
- init_waitqueue_head(&ar->peer_mapping_wq);
- init_waitqueue_head(&ar->htt.empty_tx_wq);
---- a/drivers/net/wireless/ath/ath10k/core.h
-+++ b/drivers/net/wireless/ath/ath10k/core.h
-@@ -1089,6 +1089,9 @@ struct ath10k {
- /* protects shared structure data */
- spinlock_t data_lock;
-
-+ /* serialize wake_tx_queue calls per ac */
-+ spinlock_t queue_lock[IEEE80211_NUM_ACS];
-+
- struct list_head arvifs;
- struct list_head peers;
- struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS];
---- a/drivers/net/wireless/ath/ath10k/mac.c
-+++ b/drivers/net/wireless/ath/ath10k/mac.c
-@@ -4406,13 +4406,14 @@ static void ath10k_mac_op_wake_tx_queue(
- {
- struct ath10k *ar = hw->priv;
- int ret;
-- u8 ac;
-+ u8 ac = txq->ac;
-
- ath10k_htt_tx_txq_update(hw, txq);
- if (ar->htt.tx_q_state.mode != HTT_TX_MODE_SWITCH_PUSH)
- return;
-
-- ac = txq->ac;
-+ spin_lock_bh(&ar->queue_lock[ac]);
-+
- ieee80211_txq_schedule_start(hw, ac);
- txq = ieee80211_next_txq(hw, ac);
- if (!txq)
-@@ -4427,6 +4428,7 @@ static void ath10k_mac_op_wake_tx_queue(
- ath10k_htt_tx_txq_update(hw, txq);
- out:
- ieee80211_txq_schedule_end(hw, ac);
-+ spin_unlock_bh(&ar->queue_lock[ac]);
- }
-
- /* Must not be called with conf_mutex held as workers can use that also. */
projects / thirdparty / kernel / stable-queue.git / commitdiff
