From: Greg Kroah-Hartman Date: Fri, 10 Mar 2023 08:18:58 +0000 (+0100) Subject: drop scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch from everywhere X-Git-Tag: v6.2.3~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2c3d2bfb18454699d7c6b0c04c9439d738d2009;p=thirdparty%2Fkernel%2Fstable-queue.git drop scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch from everywhere --- diff --git a/queue-4.14/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-4.14/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index 146091a9902..00000000000 --- a/queue-4.14/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -173,6 +173,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - spin_lock_irqsave(shost->host_lock, flags); - if (scsi_host_set_state(shost, SHOST_DEL)) -@@ -324,6 +325,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&shost->rcu, ...) */ diff --git a/queue-4.14/series b/queue-4.14/series index a13c922d4c4..4ecc2e15645 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -136,7 +136,6 @@ rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch alpha-fix-fen-fault-handling.patch mips-fix-syscall_get_nr.patch ktest.pl-fix-missing-end_monitor-when-machine-check-fails.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-fix-erroneous-link-down.patch scsi-ses-don-t-attach-if-enclosure-has-no-components.patch diff --git a/queue-4.19/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-4.19/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index 902af7a36d4..00000000000 --- a/queue-4.19/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -178,6 +178,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - spin_lock_irqsave(shost->host_lock, flags); - if (scsi_host_set_state(shost, SHOST_DEL)) -@@ -329,6 +330,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&shost->rcu, ...) */ diff --git a/queue-4.19/series b/queue-4.19/series index e3c8a8a7a6a..05939407b7d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -183,7 +183,6 @@ media-ipu3-cio2-fix-pm-runtime-usage_count-in-driver-unbind.patch ktest.pl-give-back-console-on-ctrt-c-on-monitor.patch ktest.pl-fix-missing-end_monitor-when-machine-check-fails.patch ktest.pl-add-run_timeout-option-with-default-unlimited.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-fix-erroneous-link-down.patch scsi-ses-don-t-attach-if-enclosure-has-no-components.patch diff --git a/queue-5.10/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-5.10/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index 59887278b16..00000000000 --- a/queue-5.10/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -180,6 +180,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - spin_lock_irqsave(shost->host_lock, flags); - if (scsi_host_set_state(shost, SHOST_DEL)) -@@ -321,6 +322,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&shost->rcu, ...) */ diff --git a/queue-5.10/series b/queue-5.10/series index a9b313ad14c..995077c395f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -408,7 +408,6 @@ ktest.pl-give-back-console-on-ctrt-c-on-monitor.patch ktest.pl-fix-missing-end_monitor-when-machine-check-fails.patch ktest.pl-add-run_timeout-option-with-default-unlimited.patch ring-buffer-handle-race-between-rb_move_tail-and-rb_check_pages.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-fix-dma-api-call-trace-on-nvme-ls-requests.patch scsi-qla2xxx-fix-erroneous-link-down.patch diff --git a/queue-5.15/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-5.15/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index 1d6deb905a9..00000000000 --- a/queue-5.15/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -180,6 +180,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - spin_lock_irqsave(shost->host_lock, flags); - if (scsi_host_set_state(shost, SHOST_DEL)) -@@ -321,6 +322,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&scmd->rcu, ...) */ diff --git a/queue-5.15/series b/queue-5.15/series index 5db16afb45a..93b80d58f4c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -532,7 +532,6 @@ ktest.pl-fix-missing-end_monitor-when-machine-check-fails.patch ktest.pl-add-run_timeout-option-with-default-unlimited.patch ring-buffer-handle-race-between-rb_move_tail-and-rb_check_pages.patch tools-bootconfig-fix-single-used-for-logical-condition.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-check-if-port-is-online-before-sending-els.patch scsi-qla2xxx-fix-dma-api-call-trace-on-nvme-ls-requests.patch diff --git a/queue-5.4/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-5.4/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index cbfe1da88f3..00000000000 --- a/queue-5.4/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -179,6 +179,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - spin_lock_irqsave(shost->host_lock, flags); - if (scsi_host_set_state(shost, SHOST_DEL)) -@@ -318,6 +319,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&shost->rcu, ...) */ diff --git a/queue-5.4/series b/queue-5.4/series index cd4ac9b1a1b..c7eecb20468 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -266,7 +266,6 @@ mm-thp-check-and-bail-out-if-page-in-deferred-queue-already.patch ktest.pl-give-back-console-on-ctrt-c-on-monitor.patch ktest.pl-fix-missing-end_monitor-when-machine-check-fails.patch ktest.pl-add-run_timeout-option-with-default-unlimited.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-fix-dma-api-call-trace-on-nvme-ls-requests.patch scsi-qla2xxx-fix-erroneous-link-down.patch diff --git a/queue-6.1/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-6.1/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index dbebf366731..00000000000 --- a/queue-6.1/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -181,6 +181,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - /* - * New SCSI devices cannot be attached anymore because of the SCSI host -@@ -340,6 +341,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&scmd->rcu, ...) */ diff --git a/queue-6.1/series b/queue-6.1/series index 3f071c831d3..bec3cba8540 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -838,7 +838,6 @@ tracing-eprobe-fix-to-add-filter-on-eprobe-description-in-readme-file.patch iommu-amd-add-a-length-limitation-for-the-ivrs_acpihid-command-line-parameter.patch iommu-amd-improve-page-fault-error-reporting.patch scsi-aacraid-allocate-cmd_priv-with-scsicmd.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-check-if-port-is-online-before-sending-els.patch scsi-qla2xxx-fix-dma-api-call-trace-on-nvme-ls-requests.patch diff --git a/queue-6.2/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch b/queue-6.2/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch deleted file mode 100644 index dbebf366731..00000000000 --- a/queue-6.2/scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fc663711b94468f4e1427ebe289c9f05669699c9 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Fri, 10 Feb 2023 12:52:00 -0800 -Subject: scsi: core: Remove the /proc/scsi/${proc_name} directory earlier - -From: Bart Van Assche - -commit fc663711b94468f4e1427ebe289c9f05669699c9 upstream. - -Remove the /proc/scsi/${proc_name} directory earlier to fix a race -condition between unloading and reloading kernel modules. This fixes a bug -introduced in 2009 by commit 77c019768f06 ("[SCSI] fix /proc memory leak in -the SCSI core"). - -Fix the following kernel warning: - -proc_dir_entry 'scsi/scsi_debug' already registered -WARNING: CPU: 19 PID: 27986 at fs/proc/generic.c:376 proc_register+0x27d/0x2e0 -Call Trace: - proc_mkdir+0xb5/0xe0 - scsi_proc_hostdir_add+0xb5/0x170 - scsi_host_alloc+0x683/0x6c0 - sdebug_driver_probe+0x6b/0x2d0 [scsi_debug] - really_probe+0x159/0x540 - __driver_probe_device+0xdc/0x230 - driver_probe_device+0x4f/0x120 - __device_attach_driver+0xef/0x180 - bus_for_each_drv+0xe5/0x130 - __device_attach+0x127/0x290 - device_initial_probe+0x17/0x20 - bus_probe_device+0x110/0x130 - device_add+0x673/0xc80 - device_register+0x1e/0x30 - sdebug_add_host_helper+0x1a7/0x3b0 [scsi_debug] - scsi_debug_init+0x64f/0x1000 [scsi_debug] - do_one_initcall+0xd7/0x470 - do_init_module+0xe7/0x330 - load_module+0x122a/0x12c0 - __do_sys_finit_module+0x124/0x1a0 - __x64_sys_finit_module+0x46/0x50 - do_syscall_64+0x38/0x80 - entry_SYSCALL_64_after_hwframe+0x46/0xb0 - -Link: https://lore.kernel.org/r/20230210205200.36973-3-bvanassche@acm.org -Cc: Alan Stern -Cc: Yi Zhang -Cc: stable@vger.kernel.org -Fixes: 77c019768f06 ("[SCSI] fix /proc memory leak in the SCSI core") -Reported-by: Yi Zhang -Signed-off-by: Bart Van Assche -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/hosts.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/hosts.c -+++ b/drivers/scsi/hosts.c -@@ -181,6 +181,7 @@ void scsi_remove_host(struct Scsi_Host * - scsi_forget_host(shost); - mutex_unlock(&shost->scan_mutex); - scsi_proc_host_rm(shost); -+ scsi_proc_hostdir_rm(shost->hostt); - - /* - * New SCSI devices cannot be attached anymore because of the SCSI host -@@ -340,6 +341,7 @@ static void scsi_host_dev_release(struct - struct Scsi_Host *shost = dev_to_shost(dev); - struct device *parent = dev->parent; - -+ /* In case scsi_remove_host() has not been called. */ - scsi_proc_hostdir_rm(shost->hostt); - - /* Wait for functions invoked through call_rcu(&scmd->rcu, ...) */ diff --git a/queue-6.2/series b/queue-6.2/series index c35897016be..828212c7442 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -949,7 +949,6 @@ tools-bootconfig-fix-single-used-for-logical-condition.patch tracing-eprobe-fix-to-add-filter-on-eprobe-description-in-readme-file.patch iommu-amd-add-a-length-limitation-for-the-ivrs_acpihid-command-line-parameter.patch scsi-aacraid-allocate-cmd_priv-with-scsicmd.patch -scsi-core-remove-the-proc-scsi-proc_name-directory-earlier.patch scsi-qla2xxx-fix-link-failure-in-npiv-environment.patch scsi-qla2xxx-check-if-port-is-online-before-sending-els.patch scsi-qla2xxx-fix-dma-api-call-trace-on-nvme-ls-requests.patch