From: Greg Kroah-Hartman Date: Thu, 25 Jul 2019 06:19:41 +0000 (+0200) Subject: drop cifs patch from everywhere. X-Git-Tag: v5.2.3~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=547fedb3303993f65e4f20e468e90eb727e63514;p=thirdparty%2Fkernel%2Fstable-queue.git drop cifs patch from everywhere. --- diff --git a/queue-4.14/series b/queue-4.14/series index 9673d8584ab..0760f298e1f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -19,7 +19,6 @@ net-stmmac-dwmac1000-clear-unused-address-entries.patch net-stmmac-dwmac4-5-clear-unused-address-entries.patch qed-set-the-doorbell-address-correctly.patch signal-pid_namespace-fix-reboot_pid_ns-to-use-send_s.patch -signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch af_key-fix-leaks-in-key_pol_get_resp-and-dump_sp.patch xfrm-fix-xfrm-sel-prefix-length-validation.patch fscrypt-clean-up-some-bug_on-s-in-block-encryption-d.patch diff --git a/queue-4.14/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch b/queue-4.14/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch deleted file mode 100644 index 834b8bdd02b..00000000000 --- a/queue-4.14/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 66e63b3845525d8fb86f792db93081ef5112fb17 Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Wed, 15 May 2019 12:33:50 -0500 -Subject: signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of - force_sig - -[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] - -The locking in force_sig_info is not prepared to deal with a task that -exits or execs (as sighand may change). The is not a locking problem -in force_sig as force_sig is only built to handle synchronous -exceptions. - -Further the function force_sig_info changes the signal state if the -signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the -delivery of the signal. The signal SIGKILL can not be ignored and can -not be blocked and SIGNAL_UNKILLABLE won't prevent it from being -delivered. - -So using force_sig rather than send_sig for SIGKILL is confusing -and pointless. - -Because it won't impact the sending of the signal and and because -using force_sig is wrong, replace force_sig with send_sig. - -Cc: Namjae Jeon -Cc: Jeff Layton -Cc: Steve French -Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"") -Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code") -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Sasha Levin ---- - fs/cifs/connect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index 33cd844579ae..ebc5714fea95 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -2320,7 +2320,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) - - task = xchg(&server->tsk, NULL); - if (task) -- force_sig(SIGKILL, task); -+ send_sig(SIGKILL, task, 1); - } - - static struct TCP_Server_Info * --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index b7fd946e987..1ecb5a6c2a4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -23,7 +23,6 @@ net-stmmac-dwmac1000-clear-unused-address-entries.patch net-stmmac-dwmac4-5-clear-unused-address-entries.patch qed-set-the-doorbell-address-correctly.patch signal-pid_namespace-fix-reboot_pid_ns-to-use-send_s.patch -signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch af_key-fix-leaks-in-key_pol_get_resp-and-dump_sp.patch xfrm-fix-xfrm-sel-prefix-length-validation.patch fscrypt-clean-up-some-bug_on-s-in-block-encryption-d.patch diff --git a/queue-4.19/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch b/queue-4.19/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch deleted file mode 100644 index 67724bb1c6c..00000000000 --- a/queue-4.19/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch +++ /dev/null @@ -1,52 +0,0 @@ -From be4ea26fa58b1a1b0d8ff750d0f40645c444b890 Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Wed, 15 May 2019 12:33:50 -0500 -Subject: signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of - force_sig - -[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] - -The locking in force_sig_info is not prepared to deal with a task that -exits or execs (as sighand may change). The is not a locking problem -in force_sig as force_sig is only built to handle synchronous -exceptions. - -Further the function force_sig_info changes the signal state if the -signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the -delivery of the signal. The signal SIGKILL can not be ignored and can -not be blocked and SIGNAL_UNKILLABLE won't prevent it from being -delivered. - -So using force_sig rather than send_sig for SIGKILL is confusing -and pointless. - -Because it won't impact the sending of the signal and and because -using force_sig is wrong, replace force_sig with send_sig. - -Cc: Namjae Jeon -Cc: Jeff Layton -Cc: Steve French -Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"") -Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code") -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Sasha Levin ---- - fs/cifs/connect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index f31339db45fd..82b3af47bce3 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -2428,7 +2428,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) - - task = xchg(&server->tsk, NULL); - if (task) -- force_sig(SIGKILL, task); -+ send_sig(SIGKILL, task, 1); - } - - static struct TCP_Server_Info * --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index f24fb0142c8..5f50e8a50dd 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -12,7 +12,6 @@ media-marvell-ccic-fix-dma-s-g-desc-number-calculati.patch media-vpss-fix-a-potential-null-pointer-dereference.patch net-stmmac-dwmac1000-clear-unused-address-entries.patch signal-pid_namespace-fix-reboot_pid_ns-to-use-send_s.patch -signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch af_key-fix-leaks-in-key_pol_get_resp-and-dump_sp.patch xfrm-fix-xfrm-sel-prefix-length-validation.patch media-staging-media-davinci_vpfe-fix-for-memory-leak.patch diff --git a/queue-4.4/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch b/queue-4.4/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch deleted file mode 100644 index f591ffb70ca..00000000000 --- a/queue-4.4/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ec86d93ce747ccb2c5ed3b4c2017abb3edafcbc1 Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Wed, 15 May 2019 12:33:50 -0500 -Subject: signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of - force_sig - -[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] - -The locking in force_sig_info is not prepared to deal with a task that -exits or execs (as sighand may change). The is not a locking problem -in force_sig as force_sig is only built to handle synchronous -exceptions. - -Further the function force_sig_info changes the signal state if the -signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the -delivery of the signal. The signal SIGKILL can not be ignored and can -not be blocked and SIGNAL_UNKILLABLE won't prevent it from being -delivered. - -So using force_sig rather than send_sig for SIGKILL is confusing -and pointless. - -Because it won't impact the sending of the signal and and because -using force_sig is wrong, replace force_sig with send_sig. - -Cc: Namjae Jeon -Cc: Jeff Layton -Cc: Steve French -Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"") -Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code") -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Sasha Levin ---- - fs/cifs/connect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index 9cb72fd40eff..bc7c287a2e17 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -2246,7 +2246,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) - - task = xchg(&server->tsk, NULL); - if (task) -- force_sig(SIGKILL, task); -+ send_sig(SIGKILL, task, 1); - } - - static struct TCP_Server_Info * --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 29789e55250..9db6bf82110 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -15,7 +15,6 @@ media-media_device_enum_links32-clean-a-reserved-fie.patch net-stmmac-dwmac1000-clear-unused-address-entries.patch net-stmmac-dwmac4-5-clear-unused-address-entries.patch signal-pid_namespace-fix-reboot_pid_ns-to-use-send_s.patch -signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch af_key-fix-leaks-in-key_pol_get_resp-and-dump_sp.patch xfrm-fix-xfrm-sel-prefix-length-validation.patch media-mc-device.c-don-t-memset-__user-pointer-conten.patch diff --git a/queue-4.9/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch b/queue-4.9/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch deleted file mode 100644 index 0cc252a6171..00000000000 --- a/queue-4.9/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6b774dc4e8d1e50db4a4c639b79c6f337f244728 Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Wed, 15 May 2019 12:33:50 -0500 -Subject: signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of - force_sig - -[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] - -The locking in force_sig_info is not prepared to deal with a task that -exits or execs (as sighand may change). The is not a locking problem -in force_sig as force_sig is only built to handle synchronous -exceptions. - -Further the function force_sig_info changes the signal state if the -signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the -delivery of the signal. The signal SIGKILL can not be ignored and can -not be blocked and SIGNAL_UNKILLABLE won't prevent it from being -delivered. - -So using force_sig rather than send_sig for SIGKILL is confusing -and pointless. - -Because it won't impact the sending of the signal and and because -using force_sig is wrong, replace force_sig with send_sig. - -Cc: Namjae Jeon -Cc: Jeff Layton -Cc: Steve French -Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"") -Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code") -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Sasha Levin ---- - fs/cifs/connect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index f291ed0c155d..d1019cbf7a52 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -2221,7 +2221,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) - - task = xchg(&server->tsk, NULL); - if (task) -- force_sig(SIGKILL, task); -+ send_sig(SIGKILL, task, 1); - } - - static struct TCP_Server_Info * --- -2.20.1 - diff --git a/queue-5.1/series b/queue-5.1/series index 6966e59e4f0..48515a21b53 100644 --- a/queue-5.1/series +++ b/queue-5.1/series @@ -35,7 +35,6 @@ net-stmmac-prevent-missing-interrupts-when-running-n.patch net-hns3-initialize-cpu-reverse-mapping.patch qed-set-the-doorbell-address-correctly.patch signal-pid_namespace-fix-reboot_pid_ns-to-use-send_s.patch -signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch af_key-fix-leaks-in-key_pol_get_resp-and-dump_sp.patch xfrm-fix-xfrm-sel-prefix-length-validation.patch media-vim2m-fix-two-double-free-issues.patch diff --git a/queue-5.1/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch b/queue-5.1/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch deleted file mode 100644 index 832729f7310..00000000000 --- a/queue-5.1/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ed1468091c28abd7d8f31f81259dcf08fa8f8497 Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Wed, 15 May 2019 12:33:50 -0500 -Subject: signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of - force_sig - -[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] - -The locking in force_sig_info is not prepared to deal with a task that -exits or execs (as sighand may change). The is not a locking problem -in force_sig as force_sig is only built to handle synchronous -exceptions. - -Further the function force_sig_info changes the signal state if the -signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the -delivery of the signal. The signal SIGKILL can not be ignored and can -not be blocked and SIGNAL_UNKILLABLE won't prevent it from being -delivered. - -So using force_sig rather than send_sig for SIGKILL is confusing -and pointless. - -Because it won't impact the sending of the signal and and because -using force_sig is wrong, replace force_sig with send_sig. - -Cc: Namjae Jeon -Cc: Jeff Layton -Cc: Steve French -Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"") -Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code") -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Sasha Levin ---- - fs/cifs/connect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index e9507fba0b36..10851bb74253 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -2625,7 +2625,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) - - task = xchg(&server->tsk, NULL); - if (task) -- force_sig(SIGKILL, task); -+ send_sig(SIGKILL, task, 1); - } - - static struct TCP_Server_Info * --- -2.20.1 - diff --git a/queue-5.2/series b/queue-5.2/series index 0429a1f4ff7..9a91206c9c6 100644 --- a/queue-5.2/series +++ b/queue-5.2/series @@ -35,7 +35,6 @@ net-hns3-initialize-cpu-reverse-mapping.patch net-hns3-fix-for-fec-configuration.patch qed-set-the-doorbell-address-correctly.patch signal-pid_namespace-fix-reboot_pid_ns-to-use-send_s.patch -signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch af_key-fix-leaks-in-key_pol_get_resp-and-dump_sp.patch xfrm-fix-xfrm-sel-prefix-length-validation.patch media-vim2m-fix-two-double-free-issues.patch diff --git a/queue-5.2/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch b/queue-5.2/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch deleted file mode 100644 index 3c25279aac6..00000000000 --- a/queue-5.2/signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3db07012788baaf57549ce57cfb81871d1d9fd22 Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Wed, 15 May 2019 12:33:50 -0500 -Subject: signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of - force_sig - -[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] - -The locking in force_sig_info is not prepared to deal with a task that -exits or execs (as sighand may change). The is not a locking problem -in force_sig as force_sig is only built to handle synchronous -exceptions. - -Further the function force_sig_info changes the signal state if the -signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the -delivery of the signal. The signal SIGKILL can not be ignored and can -not be blocked and SIGNAL_UNKILLABLE won't prevent it from being -delivered. - -So using force_sig rather than send_sig for SIGKILL is confusing -and pointless. - -Because it won't impact the sending of the signal and and because -using force_sig is wrong, replace force_sig with send_sig. - -Cc: Namjae Jeon -Cc: Jeff Layton -Cc: Steve French -Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"") -Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code") -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Sasha Levin ---- - fs/cifs/connect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index 8dd6637a3cbb..714a359c7c8d 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -2631,7 +2631,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) - - task = xchg(&server->tsk, NULL); - if (task) -- force_sig(SIGKILL, task); -+ send_sig(SIGKILL, task, 1); - } - - static struct TCP_Server_Info * --- -2.20.1 -