From f68503c350347be735aabc4e6a9a0a92342661ca Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 5 Nov 2024 05:20:57 -0500 Subject: [PATCH] Drop net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch Signed-off-by: Sasha Levin --- ...d-the-issue-that-the-debugfs-query-r.patch | 47 ------------------- queue-5.15/series | 1 - ...d-the-issue-that-the-debugfs-query-r.patch | 47 ------------------- queue-6.1/series | 1 - ...d-the-issue-that-the-debugfs-query-r.patch | 47 ------------------- queue-6.11/series | 1 - ...d-the-issue-that-the-debugfs-query-r.patch | 47 ------------------- queue-6.6/series | 1 - 8 files changed, 192 deletions(-) delete mode 100644 queue-5.15/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch delete mode 100644 queue-6.1/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch delete mode 100644 queue-6.11/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch delete mode 100644 queue-6.6/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch diff --git a/queue-5.15/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch b/queue-5.15/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch deleted file mode 100644 index c04c26ebe7d..00000000000 --- a/queue-5.15/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e3025a942d034818d78d55d1ef1f86fe262e02cb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:34 +0800 -Subject: net: hns3: Resolved the issue that the debugfs query result is - inconsistent. - -From: Hao Lan - -[ Upstream commit 2758f18a83ef283d50c0566d3f672621cc658a1a ] - -This patch modifies the implementation of debugfs: -When the user process stops unexpectedly, not all data of the file system -is read. In this case, the save_buf pointer is not released. When the user -process is called next time, save_buf is used to copy the cached data -to the user space. As a result, the queried data is inconsistent. To solve -this problem, determine whether the function is invoked for the first time -based on the value of *ppos. If *ppos is 0, obtain the actual data. - -Fixes: 5e69ea7ee2a6 ("net: hns3: refactor the debugfs process") -Signed-off-by: Hao Lan -Signed-off-by: Guangwei Zhang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -index bd801e35d51ea..b4580c02ff539 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -@@ -1043,8 +1043,10 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, - - /* save the buffer addr until the last read operation */ - *save_buf = read_buf; -+ } - -- /* get data ready for the first time to read */ -+ /* get data ready for the first time to read */ -+ if (!*ppos) { - ret = hns3_dbg_read_cmd(dbg_data, hns3_dbg_cmd[index].cmd, - read_buf, hns3_dbg_cmd[index].buf_len); - if (ret) --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index f6db221ce75..1bcddb43387 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -25,7 +25,6 @@ bpf-fix-out-of-bounds-write-in-trie_get_next_key.patch netfilter-fix-use-after-free-in-get_info.patch net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch acpi-cppc-make-rmw_lock-a-raw_spin_lock.patch fs-ntfs3-check-if-more-than-chunk-size-bytes-are-wri.patch diff --git a/queue-6.1/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch b/queue-6.1/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch deleted file mode 100644 index 2b325f72b71..00000000000 --- a/queue-6.1/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 673b67fbd8aaa0f337ccc2064f70cbec1a78893d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:34 +0800 -Subject: net: hns3: Resolved the issue that the debugfs query result is - inconsistent. - -From: Hao Lan - -[ Upstream commit 2758f18a83ef283d50c0566d3f672621cc658a1a ] - -This patch modifies the implementation of debugfs: -When the user process stops unexpectedly, not all data of the file system -is read. In this case, the save_buf pointer is not released. When the user -process is called next time, save_buf is used to copy the cached data -to the user space. As a result, the queried data is inconsistent. To solve -this problem, determine whether the function is invoked for the first time -based on the value of *ppos. If *ppos is 0, obtain the actual data. - -Fixes: 5e69ea7ee2a6 ("net: hns3: refactor the debugfs process") -Signed-off-by: Hao Lan -Signed-off-by: Guangwei Zhang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -index d2603cfc122c8..87720a74341b1 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -@@ -1279,8 +1279,10 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, - - /* save the buffer addr until the last read operation */ - *save_buf = read_buf; -+ } - -- /* get data ready for the first time to read */ -+ /* get data ready for the first time to read */ -+ if (!*ppos) { - ret = hns3_dbg_read_cmd(dbg_data, hns3_dbg_cmd[index].cmd, - read_buf, hns3_dbg_cmd[index].buf_len); - if (ret) --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 0b5d288bc76..99503907fda 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -35,7 +35,6 @@ mlxsw-spectrum_router-add-support-for-double-entry-r.patch mlxsw-spectrum_ipip-rename-spectrum-2-ip6gre-operati.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch iomap-convert-iomap_unshare_iter-to-use-large-folios.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch diff --git a/queue-6.11/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch b/queue-6.11/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch deleted file mode 100644 index 44e9b197411..00000000000 --- a/queue-6.11/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7e07122807d23ae2d5e974a19b84949540a37002 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:34 +0800 -Subject: net: hns3: Resolved the issue that the debugfs query result is - inconsistent. - -From: Hao Lan - -[ Upstream commit 2758f18a83ef283d50c0566d3f672621cc658a1a ] - -This patch modifies the implementation of debugfs: -When the user process stops unexpectedly, not all data of the file system -is read. In this case, the save_buf pointer is not released. When the user -process is called next time, save_buf is used to copy the cached data -to the user space. As a result, the queried data is inconsistent. To solve -this problem, determine whether the function is invoked for the first time -based on the value of *ppos. If *ppos is 0, obtain the actual data. - -Fixes: 5e69ea7ee2a6 ("net: hns3: refactor the debugfs process") -Signed-off-by: Hao Lan -Signed-off-by: Guangwei Zhang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -index 807eb3bbb11c0..841e5af7b2bee 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -@@ -1293,8 +1293,10 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, - - /* save the buffer addr until the last read operation */ - *save_buf = read_buf; -+ } - -- /* get data ready for the first time to read */ -+ /* get data ready for the first time to read */ -+ if (!*ppos) { - ret = hns3_dbg_read_cmd(dbg_data, hns3_dbg_cmd[index].cmd, - read_buf, hns3_dbg_cmd[index].buf_len); - if (ret) --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 0644855ba25..fbea815a14d 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -53,7 +53,6 @@ mlxsw-pci-sync-rx-buffers-for-device.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch net-ethernet-mtk_wed-fix-path-of-mt7988-wo-firmware.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch diff --git a/queue-6.6/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch b/queue-6.6/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch deleted file mode 100644 index 1f52b5c07af..00000000000 --- a/queue-6.6/net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 95fc555c27d4cd6ab3cf77c3bd730dcf3adef45a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:34 +0800 -Subject: net: hns3: Resolved the issue that the debugfs query result is - inconsistent. - -From: Hao Lan - -[ Upstream commit 2758f18a83ef283d50c0566d3f672621cc658a1a ] - -This patch modifies the implementation of debugfs: -When the user process stops unexpectedly, not all data of the file system -is read. In this case, the save_buf pointer is not released. When the user -process is called next time, save_buf is used to copy the cached data -to the user space. As a result, the queried data is inconsistent. To solve -this problem, determine whether the function is invoked for the first time -based on the value of *ppos. If *ppos is 0, obtain the actual data. - -Fixes: 5e69ea7ee2a6 ("net: hns3: refactor the debugfs process") -Signed-off-by: Hao Lan -Signed-off-by: Guangwei Zhang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -index 4f385a18d288e..9dbb8e8d2a23e 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c -@@ -1288,8 +1288,10 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, - - /* save the buffer addr until the last read operation */ - *save_buf = read_buf; -+ } - -- /* get data ready for the first time to read */ -+ /* get data ready for the first time to read */ -+ if (!*ppos) { - ret = hns3_dbg_read_cmd(dbg_data, hns3_dbg_cmd[index].cmd, - read_buf, hns3_dbg_cmd[index].buf_len); - if (ret) --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 440e98c6c14..3eb0e8a4f68 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -37,7 +37,6 @@ net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch mlxsw-spectrum_ptp-add-missing-verification-before-p.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch -- 2.47.3