Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-17 06:54:29 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-17 06:54:29 +0200
commit07d2e253d2b388efd4d1cced9cc6fa3746f2ef78 (patch)
treeb86436e082d60147bad948d426d54755569de3ab
parent4baa04bc2a08e48ca10f7838f4d1a2a8f359c0fb (diff)
parent3d34296dc1f9a3ba054dcae53ad6c109b42364ad (diff)
Merge branch 'master' into stable
-rw-r--r--patches.suse/Revert-Don-t-jump-to-compute_result-state-from-check.patch56
-rw-r--r--patches.suse/Revert-selinux-do-not-report-error-on-connect-AF_UNS.patch53
-rw-r--r--series.conf2
3 files changed, 111 insertions, 0 deletions
diff --git a/patches.suse/Revert-Don-t-jump-to-compute_result-state-from-check.patch b/patches.suse/Revert-Don-t-jump-to-compute_result-state-from-check.patch
new file mode 100644
index 0000000000..759aa6ac2f
--- /dev/null
+++ b/patches.suse/Revert-Don-t-jump-to-compute_result-state-from-check.patch
@@ -0,0 +1,56 @@
+From: Song Liu <songliubraving@fb.com>
+Date: Tue, 16 Apr 2019 09:34:21 -0700
+Subject: Revert "Don't jump to compute_result state from check_result state"
+Git-commit: a25d8c327bb41742dbd59f8c545f59f3b9c39983
+Patch-mainline: 5.2-rc1
+References: git-fixes
+
+This reverts commit 4f4fd7c5798bbdd5a03a60f6269cf1177fbd11ef.
+
+Cc: Dan Williams <dan.j.williams@intel.com>
+Cc: Nigel Croxon <ncroxon@redhat.com>
+Cc: Xiao Ni <xni@redhat.com>
+Signed-off-by: Song Liu <songliubraving@fb.com>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/md/raid5.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
+index 2b0a715e70c9..b5742d07662d 100644
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -4227,15 +4227,26 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh,
+ case check_state_check_result:
+ sh->check_state = check_state_idle;
+
+- if (s->failed > 1)
+- break;
+ /* handle a successful check operation, if parity is correct
+ * we are done. Otherwise update the mismatch count and repair
+ * parity if !MD_RECOVERY_CHECK
+ */
+ if (sh->ops.zero_sum_result == 0) {
+- /* Any parity checked was correct */
+- set_bit(STRIPE_INSYNC, &sh->state);
++ /* both parities are correct */
++ if (!s->failed)
++ set_bit(STRIPE_INSYNC, &sh->state);
++ else {
++ /* in contrast to the raid5 case we can validate
++ * parity, but still have a failure to write
++ * back
++ */
++ sh->check_state = check_state_compute_result;
++ /* Returning at this point means that we may go
++ * off and bring p and/or q uptodate again so
++ * we make sure to check zero_sum_result again
++ * to verify if p or q need writeback
++ */
++ }
+ } else {
+ atomic64_add(STRIPE_SECTORS, &conf->mddev->resync_mismatches);
+ if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery)) {
+--
+2.21.0
+
diff --git a/patches.suse/Revert-selinux-do-not-report-error-on-connect-AF_UNS.patch b/patches.suse/Revert-selinux-do-not-report-error-on-connect-AF_UNS.patch
new file mode 100644
index 0000000000..02e72e67d9
--- /dev/null
+++ b/patches.suse/Revert-selinux-do-not-report-error-on-connect-AF_UNS.patch
@@ -0,0 +1,53 @@
+From: Paolo Abeni <pabeni@redhat.com>
+Date: Fri, 10 May 2019 11:37:58 +0200
+Subject: Revert "selinux: do not report error on connect(AF_UNSPEC)"
+Git-commit: e711ab936a44ee9f63f1746c09029543f1b29dd2
+Patch-mainline: 5.2-rc1
+References: git-fixes
+
+This reverts commit c7e0d6cca86581092cbbf2cd868b3601495554cf.
+
+It was agreed a slightly different fix via the selinux tree.
+
+v1 -> v2:
+ - use the correct reverted commit hash
+
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ security/selinux/hooks.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index d82b87c16b0a..c61787b15f27 100644
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -4649,7 +4649,7 @@ static int selinux_socket_connect_helper(struct socket *sock,
+ struct lsm_network_audit net = {0,};
+ struct sockaddr_in *addr4 = NULL;
+ struct sockaddr_in6 *addr6 = NULL;
+- unsigned short snum = 0;
++ unsigned short snum;
+ u32 sid, perm;
+
+ /* sctp_connectx(3) calls via selinux_sctp_bind_connect()
+@@ -4674,12 +4674,12 @@ static int selinux_socket_connect_helper(struct socket *sock,
+ break;
+ default:
+ /* Note that SCTP services expect -EINVAL, whereas
+- * others must handle this at the protocol level:
+- * connect(AF_UNSPEC) on a connected socket is
+- * a documented way disconnect the socket.
++ * others expect -EAFNOSUPPORT.
+ */
+ if (sksec->sclass == SECCLASS_SCTP_SOCKET)
+ return -EINVAL;
++ else
++ return -EAFNOSUPPORT;
+ }
+
+ err = sel_netport_sid(sk->sk_protocol, snum, &sid);
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index c66a1ad6b3..485c31eb60 100644
--- a/series.conf
+++ b/series.conf
@@ -461,12 +461,14 @@
########################################################
# md
########################################################
+ patches.suse/Revert-Don-t-jump-to-compute_result-state-from-check.patch
##########################################################
#
# Security stuff
#
##########################################################
+ patches.suse/Revert-selinux-do-not-report-error-on-connect-AF_UNS.patch
##########################################################
# Audit